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

Bump antsibull-docs to 2.16.3 #2367

Merged
merged 2 commits into from
Jan 20, 2025
Merged

Conversation

felixfontein
Copy link
Collaborator

@felixfontein felixfontein added 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 backport-2.18 Automatically create a backport for the stable-2.18 branch labels Jan 17, 2025
Copy link
Contributor

@oraNod oraNod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks @felixfontein

I've built the package docs and had a look through the staged files: https://ansible-community.github.io/package-doc-builds/

Here is the run with build logs and stuff: https://github.com/ansible/ansible-documentation/actions/runs/12869464306

@oraNod oraNod merged commit 1b91cd7 into ansible:devel Jan 20, 2025
11 checks passed
Copy link

patchback bot commented Jan 20, 2025

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

❌ Failed to cleanly apply 1b91cd7 on top of patchback/backports/stable-2.16/1b91cd7f081f64b6f524fc27a5c1372ebc594464/pr-2367

Backporting merged PR #2367 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.16/1b91cd7f081f64b6f524fc27a5c1372ebc594464/pr-2367 upstream/stable-2.16
  4. Now, cherry-pick PR Bump antsibull-docs to 2.16.3 #2367 contents into that branch:
    $ git cherry-pick -x 1b91cd7f081f64b6f524fc27a5c1372ebc594464
    If it'll yell at you with something like fatal: Commit 1b91cd7f081f64b6f524fc27a5c1372ebc594464 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 1b91cd7f081f64b6f524fc27a5c1372ebc594464
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Bump antsibull-docs to 2.16.3 #2367 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.16/1b91cd7f081f64b6f524fc27a5c1372ebc594464/pr-2367
  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.

Copy link

patchback bot commented Jan 20, 2025

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

❌ Failed to cleanly apply 1b91cd7 on top of patchback/backports/stable-2.17/1b91cd7f081f64b6f524fc27a5c1372ebc594464/pr-2367

Backporting merged PR #2367 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.17/1b91cd7f081f64b6f524fc27a5c1372ebc594464/pr-2367 upstream/stable-2.17
  4. Now, cherry-pick PR Bump antsibull-docs to 2.16.3 #2367 contents into that branch:
    $ git cherry-pick -x 1b91cd7f081f64b6f524fc27a5c1372ebc594464
    If it'll yell at you with something like fatal: Commit 1b91cd7f081f64b6f524fc27a5c1372ebc594464 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 1b91cd7f081f64b6f524fc27a5c1372ebc594464
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Bump antsibull-docs to 2.16.3 #2367 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.17/1b91cd7f081f64b6f524fc27a5c1372ebc594464/pr-2367
  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.

Copy link

patchback bot commented Jan 20, 2025

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

❌ Failed to cleanly apply 1b91cd7 on top of patchback/backports/stable-2.18/1b91cd7f081f64b6f524fc27a5c1372ebc594464/pr-2367

Backporting merged PR #2367 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.18/1b91cd7f081f64b6f524fc27a5c1372ebc594464/pr-2367 upstream/stable-2.18
  4. Now, cherry-pick PR Bump antsibull-docs to 2.16.3 #2367 contents into that branch:
    $ git cherry-pick -x 1b91cd7f081f64b6f524fc27a5c1372ebc594464
    If it'll yell at you with something like fatal: Commit 1b91cd7f081f64b6f524fc27a5c1372ebc594464 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 1b91cd7f081f64b6f524fc27a5c1372ebc594464
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Bump antsibull-docs to 2.16.3 #2367 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.18/1b91cd7f081f64b6f524fc27a5c1372ebc594464/pr-2367
  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.

@oraNod
Copy link
Contributor

oraNod commented Jan 20, 2025

Thanks for the new version of antsibull-docs and for bumping the version here @felixfontein 🚀

@oraNod
Copy link
Contributor

oraNod commented Jan 20, 2025

@felixfontein I've created manual backports for the stable branches if you could please take a look. Hopefully they're alright. Cheers!

@felixfontein
Copy link
Collaborator Author

@oraNod thanks a lot for reviewing, merging, and backporting! :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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 backport-2.18 Automatically create a backport for the stable-2.18 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants