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 and antsibull-docs-parser versions #1799

Merged
merged 2 commits into from
Aug 26, 2024

Conversation

felixfontein
Copy link
Collaborator

antsibull-docs 2.13.0 and antsibull-docs-parser 1.1.0 are out with improved markup generation.

@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 labels Aug 25, 2024
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 🚀

@oraNod oraNod merged commit b0315c3 into ansible:devel Aug 26, 2024
9 checks passed
Copy link

patchback bot commented Aug 26, 2024

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

❌ Failed to cleanly apply b0315c3 on top of patchback/backports/stable-2.16/b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b/pr-1799

Backporting merged PR #1799 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/b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b/pr-1799 upstream/stable-2.16
  4. Now, cherry-pick PR Bump antsibull-docs and antsibull-docs-parser versions #1799 contents into that branch:
    $ git cherry-pick -x b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b
    If it'll yell at you with something like fatal: Commit b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b
  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 and antsibull-docs-parser versions #1799 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.16/b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b/pr-1799
  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 Aug 26, 2024

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

❌ Failed to cleanly apply b0315c3 on top of patchback/backports/stable-2.17/b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b/pr-1799

Backporting merged PR #1799 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/b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b/pr-1799 upstream/stable-2.17
  4. Now, cherry-pick PR Bump antsibull-docs and antsibull-docs-parser versions #1799 contents into that branch:
    $ git cherry-pick -x b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b
    If it'll yell at you with something like fatal: Commit b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b
  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 and antsibull-docs-parser versions #1799 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.17/b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b/pr-1799
  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 antsibull-docs branch August 26, 2024 10:08
felixfontein added a commit to felixfontein/ansible-documentation that referenced this pull request Aug 26, 2024
* Bump antsibull-docs and antsibull-docs-parser versions.

* Bump to 2.13.1.

(cherry picked from commit b0315c3)
felixfontein added a commit to felixfontein/ansible-documentation that referenced this pull request Aug 26, 2024
* Bump antsibull-docs and antsibull-docs-parser versions.

* Bump to 2.13.1.

(cherry picked from commit b0315c3)
oraNod pushed a commit that referenced this pull request Aug 26, 2024
* Bump antsibull-docs and antsibull-docs-parser versions.

* Bump to 2.13.1.

(cherry picked from commit b0315c3)
oraNod pushed a commit that referenced this pull request Aug 26, 2024
* Bump antsibull-docs and antsibull-docs-parser versions.

* Bump to 2.13.1.

(cherry picked from commit b0315c3)
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants