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

v1.17: ci: split cargo-clippy into stable and nightly (backport of #34566) #34569

Merged
merged 2 commits into from
Dec 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 21, 2023

This is an automatic backport of pull request #34566 done by Mergify.
Cherry-pick of 5247be1 has failed:

On branch mergify/bp/v1.17/pr-34566
Your branch is up to date with 'origin/v1.17'.

You are currently cherry-picking commit 5247be17a9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/cargo.yml
	new file:   scripts/cargo-clippy-nightly.sh
	new file:   scripts/cargo-clippy-stable.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .mergify.yml
	both modified:   scripts/cargo-clippy.sh

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* ci: split cargo-clippy into stable and nightly

* ci: update mergify

(cherry picked from commit 5247be1)

# Conflicts:
#	.mergify.yml
#	scripts/cargo-clippy.sh
@mergify mergify bot added the conflicts label Dec 21, 2023
@mergify mergify bot assigned yihau Dec 21, 2023
@yihau yihau added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Dec 21, 2023
@mergify mergify bot merged commit 069612e into v1.17 Dec 21, 2023
17 checks passed
@mergify mergify bot deleted the mergify/bp/v1.17/pr-34566 branch December 21, 2023 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants