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

CI: Add Fedora 41, Alpine 3.21 to CI for devel #219

Merged
merged 1 commit into from
Jan 8, 2025

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

Ref: ansible/ansible#84281
Ref: ansible/ansible#84525

ISSUE TYPE
  • Test Pull Request
COMPONENT NAME

CI

@felixfontein felixfontein added the backport-1 Automatically create a backport for the stable-1 branch label Jan 8, 2025
Copy link

codecov bot commented Jan 8, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.60%. Comparing base (bb7f9b6) to head (b54ea61).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #219   +/-   ##
=======================================
  Coverage   83.60%   83.60%           
=======================================
  Files          12       12           
  Lines         726      726           
  Branches      142      142           
=======================================
  Hits          607      607           
  Misses         84       84           
  Partials       35       35           
Flag Coverage Δ
integration 81.71% <ø> (ø)
sanity 29.61% <ø> (ø)

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 0a6b1fd into ansible-collections:main Jan 8, 2025
57 checks passed
@felixfontein felixfontein deleted the ci branch January 8, 2025 05:45
@felixfontein
Copy link
Collaborator Author

Backport missing, again.

@felixfontein felixfontein added backport-1 Automatically create a backport for the stable-1 branch and removed backport-1 Automatically create a backport for the stable-1 branch labels Jan 8, 2025
Copy link

patchback bot commented Jan 8, 2025

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

❌ Failed to cleanly apply 0a6b1fd on top of patchback/backports/stable-1/0a6b1fd858fa355f57a6cfc2b012b452cacf2c3d/pr-219

Backporting merged PR #219 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.sops.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/0a6b1fd858fa355f57a6cfc2b012b452cacf2c3d/pr-219 upstream/stable-1
  4. Now, cherry-pick PR CI: Add Fedora 41, Alpine 3.21 to CI for devel #219 contents into that branch:
    $ git cherry-pick -x 0a6b1fd858fa355f57a6cfc2b012b452cacf2c3d
    If it'll yell at you with something like fatal: Commit 0a6b1fd858fa355f57a6cfc2b012b452cacf2c3d is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 0a6b1fd858fa355f57a6cfc2b012b452cacf2c3d
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR CI: Add Fedora 41, Alpine 3.21 to CI for devel #219 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/0a6b1fd858fa355f57a6cfc2b012b452cacf2c3d/pr-219
  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 added a commit that referenced this pull request Jan 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-1 Automatically create a backport for the stable-1 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant