ansible-documentation icon indicating copy to clipboard operation
ansible-documentation copied to clipboard

Tagging nuance

Open bcoca opened this issue 1 year ago • 1 comments

Added some notes and docs on specific interactions of other systems with tags

bcoca avatar Sep 17 '24 15:09 bcoca

nox > codespell docs/docsite
2
Used config files:
    1: .codespellrc
docs/docsite/rst/playbook_guide/playbooks_tags.rst:128: supercedes ==> supersedes
docs/docsite/rst/playbook_guide/playbooks_tags.rst:143: withouth ==> without

gotmax23 avatar Sep 17 '24 17:09 gotmax23

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

❌ Failed to cleanly apply 58659cf320ae8cfcb23a2df0ac8eb622f2702a5c on top of patchback/backports/stable-2.15/58659cf320ae8cfcb23a2df0ac8eb622f2702a5c/pr-1900

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

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

❌ Failed to cleanly apply 58659cf320ae8cfcb23a2df0ac8eb622f2702a5c on top of patchback/backports/stable-2.14/58659cf320ae8cfcb23a2df0ac8eb622f2702a5c/pr-1900

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

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

❌ Failed to cleanly apply 58659cf320ae8cfcb23a2df0ac8eb622f2702a5c on top of patchback/backports/stable-2.13/58659cf320ae8cfcb23a2df0ac8eb622f2702a5c/pr-1900

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

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

❌ Failed to cleanly apply 58659cf320ae8cfcb23a2df0ac8eb622f2702a5c on top of patchback/backports/stable-2.16/58659cf320ae8cfcb23a2df0ac8eb622f2702a5c/pr-1900

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

Backport to stable-2.17: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.17/58659cf320ae8cfcb23a2df0ac8eb622f2702a5c/pr-1900

Backported as https://github.com/ansible/ansible-documentation/pull/2020

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

patchback[bot] avatar Oct 15 '24 18:10 patchback[bot]

Backport to stable-2.18: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.18/58659cf320ae8cfcb23a2df0ac8eb622f2702a5c/pr-1900

Backported as https://github.com/ansible/ansible-documentation/pull/2021

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

patchback[bot] avatar Oct 15 '24 18:10 patchback[bot]

@bcoca Hi, looks like there were some backport failures with these changes. Could you please have a look and manually backport to stable branches as needed?

oraNod avatar Oct 15 '24 18:10 oraNod