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.14: ci: remove -f from cargo install rustfilt (backport of #33143) #33147

Merged
merged 3 commits into from
Sep 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 5, 2023

This is an automatic backport of pull request #33143 done by Mergify.
Cherry-pick of 3a91d3c has failed:

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

You are currently cherry-picking commit 3a91d3cc6a.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/cargo-build-sbf/tests/crates.rs

no changes added to commit (use "git add" and/or "git commit -a")

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

(cherry picked from commit 3a91d3c)

# Conflicts:
#	sdk/cargo-build-sbf/tests/crates.rs
@mergify mergify bot added the conflicts label Sep 5, 2023
@mergify mergify bot assigned yihau Sep 5, 2023
@yihau yihau removed the conflicts label Sep 5, 2023
@yihau yihau requested a review from dmakarov September 5, 2023 17:29
@yihau yihau added the automerge Merge this Pull Request automatically once CI passes label Sep 5, 2023
@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Sep 5, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Sep 5, 2023

automerge label removed due to a CI failure

@codecov
Copy link

codecov bot commented Sep 6, 2023

Codecov Report

Merging #33147 (e4a424e) into v1.14 (4b117d6) will increase coverage by 0.0%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            v1.14   #33147   +/-   ##
=======================================
  Coverage    82.1%    82.1%           
=======================================
  Files         665      665           
  Lines      185585   185585           
=======================================
+ Hits       152492   152529   +37     
+ Misses      33093    33056   -37     

@yihau yihau added the automerge Merge this Pull Request automatically once CI passes label Sep 6, 2023
@mergify mergify bot merged commit b85abeb into v1.14 Sep 6, 2023
@mergify mergify bot deleted the mergify/bp/v1.14/pr-33143 branch September 6, 2023 02:35
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