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 linters in CI #873

Merged

Conversation

yurnov
Copy link
Contributor

@yurnov yurnov commented Feb 3, 2025

SUMMARY

It seems that recent updates in linters break CI. Closes #874

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

CI

ADDITIONAL INFORMATION

Copy link

Copy link

Copy link

@yurnov yurnov changed the title [WIP] fix linters in CI Fix linters in CI Feb 3, 2025
Copy link

Copy link

Copy link

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

✔️ ansible-galaxy-importer SUCCESS in 8m 57s
✔️ build-ansible-collection SUCCESS in 5m 18s

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 91df2f1 into ansible-collections:main Feb 6, 2025
61 of 62 checks passed
Copy link

patchback bot commented Feb 6, 2025

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

❌ Failed to cleanly apply 91df2f1 on top of patchback/backports/stable-3/91df2f10bc254633a8892118da0ce589703ec514/pr-873

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

Copy link

patchback bot commented Feb 6, 2025

Backport to stable-5: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-5/91df2f10bc254633a8892118da0ce589703ec514/pr-873

Backported as #876

🤖 @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 Feb 6, 2025
SUMMARY
It seems that recent updates in linters break CI. Closes #874
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
CI
ADDITIONAL INFORMATION

Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Yuriy Novostavskiy
(cherry picked from commit 91df2f1)
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Feb 6, 2025
This is a backport of PR #873 as merged into main (91df2f1).
SUMMARY
It seems that recent updates in linters break CI. Closes #874
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
CI
ADDITIONAL INFORMATION

Reviewed-by: Mike Graves <[email protected]>
yurnov added a commit to yurnov/kubernetes.core that referenced this pull request Feb 6, 2025
SUMMARY
It seems that recent updates in linters break CI. Closes ansible-collections#874
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
CI
ADDITIONAL INFORMATION

Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Yuriy Novostavskiy
gravesm pushed a commit to gravesm/kubernetes.core that referenced this pull request Feb 6, 2025
SUMMARY
It seems that recent updates in linters break CI. Closes ansible-collections#874
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
CI
ADDITIONAL INFORMATION

Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Yuriy Novostavskiy
(cherry picked from commit 91df2f1)
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Feb 6, 2025
SUMMARY
It seems that recent updates in linters break CI. Closes #874 ISSUE TYPE
Bugfix Pull Request
COMPONENT NAME
CI
ADDITIONAL INFORMATION
It's cherry-pick #873 to stable-3 as patch bot failed
Reviewed-by: Mike Graves [email protected]
Reviewed-by: Yuriy Novostavskiy

Reviewed-by: Mike Graves <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Linters failing even on empty commit
2 participants