search

ansible-collections / community.general

Ansible Community General Collection
https://galaxy.ansible.com/ui/repo/published/community/general/
GNU General Public License v3.0
787 stars 1.45k forks source link

fix version vardict was introduced #8509

Closed russoz closed 3 weeks ago

russoz commented 3 weeks ago
SUMMARY

Fix the version in which vardict was addded in the documentation guide.

ISSUE TYPE
patchback[bot] commented 3 weeks ago

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

❌ Failed to cleanly apply d95f4d68a376c66cb11a62599ad08681321804f2 on top of patchback/backports/stable-7/d95f4d68a376c66cb11a62599ad08681321804f2/pr-8509

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

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

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

@russoz thanks!

patchback[bot] commented 3 weeks ago

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

❌ Failed to cleanly apply d95f4d68a376c66cb11a62599ad08681321804f2 on top of patchback/backports/stable-8/d95f4d68a376c66cb11a62599ad08681321804f2/pr-8509

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

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

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

Backport to stable-9: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-9/d95f4d68a376c66cb11a62599ad08681321804f2/pr-8509

Backported as https://github.com/ansible-collections/community.general/pull/8511

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