search

ansible-collections / cloud.terraform

The collection automates the management and provisioning of infrastructure as code (IaC) using the Terraform CLI tool within Ansible playbooks and Execution Environment runtimes.
GNU General Public License v3.0
100 stars 36 forks source link

docs: fix indents in aap guide #123

Closed akira6592 closed 6 months ago

akira6592 commented 6 months ago
SUMMARY

fix indents in aap guide.

ISSUE TYPE
COMPONENT NAME
ADDITIONAL INFORMATION
N/A
softwarefactory-project-zuul[bot] commented 6 months ago

Build succeeded. https://ansible.softwarefactory-project.io/zuul/buildset/ac92129f5f8e4ce9b718a7aab5f68168

:heavy_check_mark: ansible-galaxy-importer SUCCESS in 5m 07s :heavy_check_mark: build-ansible-collection SUCCESS in 7m 46s

softwarefactory-project-zuul[bot] commented 6 months ago

Build succeeded (gate pipeline). https://ansible.softwarefactory-project.io/zuul/buildset/aad582bf784a4bdf8e3f6c9fa23a2753

:heavy_check_mark: ansible-galaxy-importer SUCCESS in 4m 43s :heavy_check_mark: build-ansible-collection SUCCESS in 9m 35s

akira6592 commented 6 months ago

Thank you for merging!

patchback[bot] commented 6 months ago

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

❌ Failed to cleanly apply f63b7a07408fddf5f202072b4630d24d2b7ebde5 on top of patchback/backports/stable-2/f63b7a07408fddf5f202072b4630d24d2b7ebde5/pr-123

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

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

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