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

Replace antsibull-lint collection-docs with antsibull-docs lint-collection-docs #4423

Merged
merged 1 commit into from
Mar 30, 2022

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

Replace antsibull-lint collection-docs with antsibull-docs lint-collection-docs in CI, since antsibull-lint will be deprecated soon. See ansible-community/antsibull-build#410.

ISSUE TYPE
  • Test Pull Request
COMPONENT NAME

CI

@ansibullbot ansibullbot added small_patch Hopefully easy to review tests tests labels Mar 30, 2022
@felixfontein felixfontein merged commit 668bbed into ansible-collections:main Mar 30, 2022
@felixfontein felixfontein deleted the antsibull branch March 30, 2022 06:00
@patchback
Copy link

patchback bot commented Mar 30, 2022

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

❌ Failed to cleanly apply 668bbed on top of patchback/backports/stable-1/668bbed602b177a44130dbc36cade632ebcc6e5b/pr-4423

Backporting merged PR #4423 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-1/668bbed602b177a44130dbc36cade632ebcc6e5b/pr-4423 upstream/stable-1
  4. Now, cherry-pick PR Replace antsibull-lint collection-docs with antsibull-docs lint-collection-docs #4423 contents into that branch:
    $ git cherry-pick -x 668bbed602b177a44130dbc36cade632ebcc6e5b
    If it'll yell at you with something like fatal: Commit 668bbed602b177a44130dbc36cade632ebcc6e5b is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 668bbed602b177a44130dbc36cade632ebcc6e5b
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Replace antsibull-lint collection-docs with antsibull-docs lint-collection-docs #4423 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/668bbed602b177a44130dbc36cade632ebcc6e5b/pr-4423
  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 restored the antsibull branch March 30, 2022 06:00
@felixfontein felixfontein deleted the antsibull branch March 30, 2022 06:00
@patchback
Copy link

patchback bot commented Mar 30, 2022

Backport to stable-2: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2/668bbed602b177a44130dbc36cade632ebcc6e5b/pr-4423

Backported as #4424

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

@patchback
Copy link

patchback bot commented Mar 30, 2022

Backport to stable-3: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-3/668bbed602b177a44130dbc36cade632ebcc6e5b/pr-4423

Backported as #4425

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

@patchback
Copy link

patchback bot commented Mar 30, 2022

Backport to stable-4: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-4/668bbed602b177a44130dbc36cade632ebcc6e5b/pr-4423

Backported as #4426

🤖 @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 Mar 30, 2022
felixfontein added a commit that referenced this pull request Mar 30, 2022
…ction-docs. (#4423) (#4424)

(cherry picked from commit 668bbed)

Co-authored-by: Felix Fontein <felix@fontein.de>
felixfontein added a commit that referenced this pull request Mar 30, 2022
…ction-docs. (#4423) (#4425)

(cherry picked from commit 668bbed)

Co-authored-by: Felix Fontein <felix@fontein.de>
felixfontein added a commit that referenced this pull request Mar 30, 2022
…ction-docs. (#4423) (#4426)

(cherry picked from commit 668bbed)

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
small_patch Hopefully easy to review tests tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants