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

release_and_maintenance: mark 8.x unmaintained as 8.7.0 released #1522

Merged
merged 1 commit into from
May 23, 2024

Conversation

chenrui333
Copy link
Contributor

since 8.7.0 got released, it would make sense to mark 8.x as unmaintained

@ansible-documentation-bot ansible-documentation-bot bot added the new_contributor This PR is the first contribution by a new community member. label May 23, 2024
@ansible-documentation-bot
Copy link
Contributor

Thanks for your Ansible docs contribution! We talk about Ansible documentation on matrix at #docs:ansible.im and on libera IRC at #ansible-docs if you ever want to join us and chat about the docs! We meet there on Tuesdays (see the Ansible calendar) and welcome additions to our weekly agenda items - scroll down to find the upcoming agenda and add a comment to put something new on that agenda.

@oraNod oraNod requested a review from samccann May 23, 2024 07:04
@samccann samccann added backport-2.15 Automatically create a backport for the stable-2.15 branch backport-2.16 Automatically create a backport for the stable-2.16 branch backport-2.17 Automatically create a backport for the stable-2.17 branch labels May 23, 2024
@samccann samccann merged commit 35cd44b into ansible:devel May 23, 2024
8 checks passed
Copy link

patchback bot commented May 23, 2024

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

❌ Failed to cleanly apply 35cd44b on top of patchback/backports/stable-2.15/35cd44b33f2d095154e0982b12b9cb112a4d31a4/pr-1522

Backporting merged PR #1522 into devel

  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/ansible-documentation.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-2.15/35cd44b33f2d095154e0982b12b9cb112a4d31a4/pr-1522 upstream/stable-2.15
  4. Now, cherry-pick PR release_and_maintenance: mark 8.x unmaintained as 8.7.0 released #1522 contents into that branch:
    $ git cherry-pick -x 35cd44b33f2d095154e0982b12b9cb112a4d31a4
    If it'll yell at you with something like fatal: Commit 35cd44b33f2d095154e0982b12b9cb112a4d31a4 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 35cd44b33f2d095154e0982b12b9cb112a4d31a4
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR release_and_maintenance: mark 8.x unmaintained as 8.7.0 released #1522 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.15/35cd44b33f2d095154e0982b12b9cb112a4d31a4/pr-1522
  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.

@samccann
Copy link
Contributor

Cool thanks for this! And welcome to the Ansible project!

Copy link

patchback bot commented May 23, 2024

Backport to stable-2.16: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.16/35cd44b33f2d095154e0982b12b9cb112a4d31a4/pr-1522

Backported as #1525

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

Copy link

patchback bot commented May 23, 2024

Backport to stable-2.17: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.17/35cd44b33f2d095154e0982b12b9cb112a4d31a4/pr-1522

Backported as #1526

🤖 @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 May 23, 2024
samccann pushed a commit that referenced this pull request May 23, 2024
samccann pushed a commit that referenced this pull request May 23, 2024
marcwrobel pushed a commit to endoflife-date/endoflife.date that referenced this pull request May 23, 2024
@chenrui333
Copy link
Contributor Author

Thanks for merging the fix! 👍

@chenrui333 chenrui333 deleted the patch-1 branch May 23, 2024 21:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-2.15 Automatically create a backport for the stable-2.15 branch backport-2.16 Automatically create a backport for the stable-2.16 branch backport-2.17 Automatically create a backport for the stable-2.17 branch new_contributor This PR is the first contribution by a new community member.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants