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

Fix linting issues reported by validate-modules in plugins #368

Merged
merged 1 commit into from Mar 8, 2022

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

See ansible-collections/news-for-maintainers#9.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

various

@Andersson007 Andersson007 merged commit 36a6518 into ansible-collections:main Mar 8, 2022
@Andersson007
Copy link
Contributor

@felixfontein thanks for fixing this!
@briantist thanks for reviewing!

@Andersson007 Andersson007 added backport-1 Automatically create a backport for the stable-1 branch backport-2 Automatically create a backport for the stable-2 branch backport-3 Automatically create a backport for the stable-3 branch labels Mar 8, 2022
@patchback
Copy link

patchback bot commented Mar 8, 2022

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

❌ Failed to cleanly apply 36a6518 on top of patchback/backports/stable-1/36a6518e68a8df1749c01f613486944a08756b24/pr-368

Backporting merged PR #368 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.network.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/36a6518e68a8df1749c01f613486944a08756b24/pr-368 upstream/stable-1
  4. Now, cherry-pick PR Fix linting issues reported by validate-modules in plugins #368 contents into that branch:
    $ git cherry-pick -x 36a6518e68a8df1749c01f613486944a08756b24
    If it'll yell at you with something like fatal: Commit 36a6518e68a8df1749c01f613486944a08756b24 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 36a6518e68a8df1749c01f613486944a08756b24
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix linting issues reported by validate-modules in plugins #368 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/36a6518e68a8df1749c01f613486944a08756b24/pr-368
  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

patchback bot commented Mar 8, 2022

Backport to stable-3: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-3/36a6518e68a8df1749c01f613486944a08756b24/pr-368

Backported as #377

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

@patchback
Copy link

patchback bot commented Mar 8, 2022

Backport to stable-2: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2/36a6518e68a8df1749c01f613486944a08756b24/pr-368

Backported as #376

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

patchback bot pushed a commit that referenced this pull request Mar 8, 2022
(cherry picked from commit 36a6518)
patchback bot pushed a commit that referenced this pull request Mar 8, 2022
(cherry picked from commit 36a6518)
Andersson007 pushed a commit that referenced this pull request Mar 8, 2022
(cherry picked from commit 36a6518)

Co-authored-by: Felix Fontein <felix@fontein.de>
Andersson007 pushed a commit that referenced this pull request Mar 8, 2022
(cherry picked from commit 36a6518)

Co-authored-by: Felix Fontein <felix@fontein.de>
@felixfontein felixfontein deleted the sanity branch March 8, 2022 12:31
@felixfontein
Copy link
Collaborator Author

@briantist @Andersson007 thanks for reviewing and merging!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-1 Automatically create a backport for the stable-1 branch backport-2 Automatically create a backport for the stable-2 branch backport-3 Automatically create a backport for the stable-3 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants