ansible / ansible-documentation

Ansible community documentation
https://docs.ansible.com/
GNU General Public License v3.0
62 stars 369 forks source link

ci: refresh dev dependencies #1657

Closed ansible-documentation-bot[bot] closed 1 day ago

patchback[bot] commented 1 day ago

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

❌ Failed to cleanly apply 6844870ed800f5696c776180b7470eaa0ae2dd42 on top of patchback/backports/stable-2.15/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657

Backporting merged PR #1657 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/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657 upstream/stable-2.15
  4. Now, cherry-pick PR #1657 contents into that branch:
    $ git cherry-pick -x 6844870ed800f5696c776180b7470eaa0ae2dd42

    If it'll yell at you with something like fatal: Commit 6844870ed800f5696c776180b7470eaa0ae2dd42 is a merge but no -m option was given., add -m 1 as follows instead:

    $ git cherry-pick -m1 -x 6844870ed800f5696c776180b7470eaa0ae2dd42
  5. At this point, you'll probably encounter some merge conflicts. You must resolve them in to preserve the patch from PR #1657 as close to the original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.15/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657
  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.

patchback[bot] commented 1 day ago

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

❌ Failed to cleanly apply 6844870ed800f5696c776180b7470eaa0ae2dd42 on top of patchback/backports/stable-2.14/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657

Backporting merged PR #1657 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.14/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657 upstream/stable-2.14
  4. Now, cherry-pick PR #1657 contents into that branch:
    $ git cherry-pick -x 6844870ed800f5696c776180b7470eaa0ae2dd42

    If it'll yell at you with something like fatal: Commit 6844870ed800f5696c776180b7470eaa0ae2dd42 is a merge but no -m option was given., add -m 1 as follows instead:

    $ git cherry-pick -m1 -x 6844870ed800f5696c776180b7470eaa0ae2dd42
  5. At this point, you'll probably encounter some merge conflicts. You must resolve them in to preserve the patch from PR #1657 as close to the original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.14/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657
  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.

patchback[bot] commented 1 day ago

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

❌ Failed to cleanly apply 6844870ed800f5696c776180b7470eaa0ae2dd42 on top of patchback/backports/stable-2.16/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657

Backporting merged PR #1657 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/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657 upstream/stable-2.16
  4. Now, cherry-pick PR #1657 contents into that branch:
    $ git cherry-pick -x 6844870ed800f5696c776180b7470eaa0ae2dd42

    If it'll yell at you with something like fatal: Commit 6844870ed800f5696c776180b7470eaa0ae2dd42 is a merge but no -m option was given., add -m 1 as follows instead:

    $ git cherry-pick -m1 -x 6844870ed800f5696c776180b7470eaa0ae2dd42
  5. At this point, you'll probably encounter some merge conflicts. You must resolve them in to preserve the patch from PR #1657 as close to the original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.16/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657
  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.

patchback[bot] commented 1 day ago

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

❌ Failed to cleanly apply 6844870ed800f5696c776180b7470eaa0ae2dd42 on top of patchback/backports/stable-2.17/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657

Backporting merged PR #1657 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/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657 upstream/stable-2.17
  4. Now, cherry-pick PR #1657 contents into that branch:
    $ git cherry-pick -x 6844870ed800f5696c776180b7470eaa0ae2dd42

    If it'll yell at you with something like fatal: Commit 6844870ed800f5696c776180b7470eaa0ae2dd42 is a merge but no -m option was given., add -m 1 as follows instead:

    $ git cherry-pick -m1 -x 6844870ed800f5696c776180b7470eaa0ae2dd42
  5. At this point, you'll probably encounter some merge conflicts. You must resolve them in to preserve the patch from PR #1657 as close to the original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.17/6844870ed800f5696c776180b7470eaa0ae2dd42/pr-1657
  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.