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

Switch to Ansible Galaxy compatible requirements files for tests #633

Merged
merged 1 commit into from
May 21, 2023

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

See ansible-community/community-topics#230.

ISSUE TYPE
  • Test Pull Request
COMPONENT NAME

test requirements files

@felixfontein felixfontein merged commit 74b70f8 into ansible-collections:main May 21, 2023
@patchback
Copy link
Contributor

patchback bot commented May 21, 2023

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

❌ Failed to cleanly apply 74b70f8 on top of patchback/backports/stable-2/74b70f81c871292d2ec28ed366e1790d8d5135d8/pr-633

Backporting merged PR #633 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.docker.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/74b70f81c871292d2ec28ed366e1790d8d5135d8/pr-633 upstream/stable-2
  4. Now, cherry-pick PR Switch to Ansible Galaxy compatible requirements files for tests #633 contents into that branch:
    $ git cherry-pick -x 74b70f81c871292d2ec28ed366e1790d8d5135d8
    If it'll yell at you with something like fatal: Commit 74b70f81c871292d2ec28ed366e1790d8d5135d8 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 74b70f81c871292d2ec28ed366e1790d8d5135d8
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Switch to Ansible Galaxy compatible requirements files for tests #633 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2/74b70f81c871292d2ec28ed366e1790d8d5135d8/pr-633
  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
Copy link
Contributor

patchback bot commented May 21, 2023

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

❌ Failed to cleanly apply 74b70f8 on top of patchback/backports/stable-2/74b70f81c871292d2ec28ed366e1790d8d5135d8/pr-633

Backporting merged PR #633 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.docker.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/74b70f81c871292d2ec28ed366e1790d8d5135d8/pr-633 upstream/stable-2
  4. Now, cherry-pick PR Switch to Ansible Galaxy compatible requirements files for tests #633 contents into that branch:
    $ git cherry-pick -x 74b70f81c871292d2ec28ed366e1790d8d5135d8
    If it'll yell at you with something like fatal: Commit 74b70f81c871292d2ec28ed366e1790d8d5135d8 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 74b70f81c871292d2ec28ed366e1790d8d5135d8
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Switch to Ansible Galaxy compatible requirements files for tests #633 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2/74b70f81c871292d2ec28ed366e1790d8d5135d8/pr-633
  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 added a commit to felixfontein/community.docker that referenced this pull request May 21, 2023
felixfontein added a commit that referenced this pull request May 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant