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: Arch Linux switched to Python 3.12 #8291

Merged
merged 1 commit into from Apr 28, 2024

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

Need to adjust the CI matrix.

Ref: ansible-community/images#74
Ref: https://forum.ansible.com/t/5187

ISSUE TYPE
  • Test Pull Request
COMPONENT NAME

CI

@felixfontein felixfontein added backport-6 Automatically create a backport for the stable-6 branch backport-7 Automatically create a backport for the stable-7 branch backport-8 Automatically create a backport for the stable-8 branch labels Apr 28, 2024
@ansibullbot ansibullbot added small_patch Hopefully easy to review needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR labels Apr 28, 2024
@felixfontein
Copy link
Collaborator Author

CI failures are unrelated.

@felixfontein felixfontein merged commit fc2024d into ansible-collections:main Apr 28, 2024
129 of 133 checks passed
Copy link

patchback bot commented Apr 28, 2024

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

❌ Failed to cleanly apply fc2024d on top of patchback/backports/stable-6/fc2024d837581fcaa427fb105c111fa194696acd/pr-8291

Backporting merged PR #8291 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.general.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-6/fc2024d837581fcaa427fb105c111fa194696acd/pr-8291 upstream/stable-6
  4. Now, cherry-pick PR CI: Arch Linux switched to Python 3.12 #8291 contents into that branch:
    $ git cherry-pick -x fc2024d837581fcaa427fb105c111fa194696acd
    If it'll yell at you with something like fatal: Commit fc2024d837581fcaa427fb105c111fa194696acd is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x fc2024d837581fcaa427fb105c111fa194696acd
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR CI: Arch Linux switched to Python 3.12 #8291 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-6/fc2024d837581fcaa427fb105c111fa194696acd/pr-8291
  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 arch branch April 28, 2024 15:19
Copy link

patchback bot commented Apr 28, 2024

Backport to stable-7: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-7/fc2024d837581fcaa427fb105c111fa194696acd/pr-8291

Backported as #8292

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

patchback bot pushed a commit that referenced this pull request Apr 28, 2024
Arch Linux switched to Python 3.12.

(cherry picked from commit fc2024d)
Copy link

patchback bot commented Apr 28, 2024

Backport to stable-8: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-8/fc2024d837581fcaa427fb105c111fa194696acd/pr-8291

Backported as #8293

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

patchback bot pushed a commit that referenced this pull request Apr 28, 2024
Arch Linux switched to Python 3.12.

(cherry picked from commit fc2024d)
felixfontein added a commit that referenced this pull request Apr 28, 2024
Arch Linux switched to Python 3.12.

(cherry picked from commit fc2024d)
felixfontein added a commit that referenced this pull request Apr 28, 2024
…hon 3.12 (#8293)

CI: Arch Linux switched to Python 3.12 (#8291)

Arch Linux switched to Python 3.12.

(cherry picked from commit fc2024d)

Co-authored-by: Felix Fontein <felix@fontein.de>
felixfontein added a commit that referenced this pull request Apr 28, 2024
…hon 3.12 (#8292)

CI: Arch Linux switched to Python 3.12 (#8291)

Arch Linux switched to Python 3.12.

(cherry picked from commit fc2024d)

Co-authored-by: Felix Fontein <felix@fontein.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-6 Automatically create a backport for the stable-6 branch backport-7 Automatically create a backport for the stable-7 branch backport-8 Automatically create a backport for the stable-8 branch needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR small_patch Hopefully easy to review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants