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 #173

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

@codecov
Copy link

codecov bot commented May 21, 2023

Codecov Report

Merging #173 (140ac92) into main (4ec0945) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #173   +/-   ##
=======================================
  Coverage   84.57%   84.57%           
=======================================
  Files          32       32           
  Lines        3850     3850           
  Branches      710      710           
=======================================
  Hits         3256     3256           
  Misses        456      456           
  Partials      138      138           
Flag Coverage Δ
integration 66.86% <ø> (ø)
sanity 22.23% <ø> (ø)
units 84.54% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@felixfontein felixfontein merged commit 2b8c66b into ansible-collections:main May 21, 2023
@patchback
Copy link

patchback bot commented May 21, 2023

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

❌ Failed to cleanly apply 2b8c66b on top of patchback/backports/stable-1/2b8c66b9836aa97a3ea2f847106a8135e83bcd2a/pr-173

Backporting merged PR #173 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.routeros.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-1/2b8c66b9836aa97a3ea2f847106a8135e83bcd2a/pr-173 upstream/stable-1
  4. Now, cherry-pick PR Switch to Ansible Galaxy compatible requirements files for tests #173 contents into that branch:
    $ git cherry-pick -x 2b8c66b9836aa97a3ea2f847106a8135e83bcd2a
    If it'll yell at you with something like fatal: Commit 2b8c66b9836aa97a3ea2f847106a8135e83bcd2a is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 2b8c66b9836aa97a3ea2f847106a8135e83bcd2a
  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 #173 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/2b8c66b9836aa97a3ea2f847106a8135e83bcd2a/pr-173
  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 felixfontein deleted the req branch May 21, 2023 11:48
felixfontein added a commit to felixfontein/community.routeros 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