Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use import galaxy workflow from ansible-collections/community.docker#754 #249

Merged
merged 1 commit into from
Jan 13, 2024

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

Ref: ansible-collections/community.docker#754

ISSUE TYPE
  • Test Pull Request
COMPONENT NAME

CI

Copy link

codecov bot commented Jan 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (56ce47a) 82.97% compared to head (359227b) 82.97%.
Report is 2 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #249   +/-   ##
=======================================
  Coverage   82.97%   82.97%           
=======================================
  Files          32       32           
  Lines        4046     4046           
  Branches      871      871           
=======================================
  Hits         3357     3357           
  Misses        506      506           
  Partials      183      183           
Flag Coverage Δ
integration 66.86% <ø> (ø)
sanity 22.10% <ø> (ø)
units 82.91% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@felixfontein felixfontein merged commit 3777b28 into ansible-collections:main Jan 13, 2024
45 checks passed
Copy link

patchback bot commented Jan 13, 2024

Backport to stable-1: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 3777b28 on top of patchback/backports/stable-1/3777b283b214dc41349fc4887e5f753537933642/pr-249

Backporting merged PR #249 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.routeros.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-1/3777b283b214dc41349fc4887e5f753537933642/pr-249 upstream/stable-1
  4. Now, cherry-pick PR Use import galaxy workflow from ansible-collections/community.docker#754 #249 contents into that branch:
    $ git cherry-pick -x 3777b283b214dc41349fc4887e5f753537933642
    If it'll yell at you with something like fatal: Commit 3777b283b214dc41349fc4887e5f753537933642 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 3777b283b214dc41349fc4887e5f753537933642
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Use import galaxy workflow from ansible-collections/community.docker#754 #249 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/3777b283b214dc41349fc4887e5f753537933642/pr-249
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein felixfontein deleted the import branch January 13, 2024 16:08
felixfontein added a commit to felixfontein/community.routeros that referenced this pull request Jan 13, 2024
felixfontein added a commit that referenced this pull request Jan 13, 2024
…ity.docker#754 (#250)

* Use import galaxy workflow from ansible-collections/community.docker#754. (#249)

(cherry picked from commit 3777b28)

* Install collection requirements.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant