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

Bump bv from 0.11.0 to 0.11.1 (bp #8952) #8955

Merged
merged 5 commits into from
Mar 19, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 19, 2020

This is an automated backport of pull request #8952 done by Mergify

Cherry-pick of 2dc50cf has failed:

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

You are currently cherry-picking commit 2dc50cff5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   Cargo.lock
	both modified:   core/Cargo.toml
	both modified:   runtime/Cargo.toml
	both modified:   sdk/Cargo.toml

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

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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
  • @Mergifyio backports <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 simulator.

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

automerge

(cherry picked from commit 2dc50cf)

# Conflicts:
#	Cargo.lock
#	core/Cargo.toml
#	runtime/Cargo.toml
#	sdk/Cargo.toml
@mergify mergify bot added the conflicts label Mar 19, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 19, 2020
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 19, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 19, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 19, 2020
@mvines mvines added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Mar 19, 2020
@solana-grimes solana-grimes merged commit a5938e5 into v1.0 Mar 19, 2020
@codecov
Copy link

codecov bot commented Mar 19, 2020

Codecov Report

Merging #8955 into v1.0 will not change coverage.
The diff coverage is n/a.

@@          Coverage Diff          @@
##            v1.0   #8955   +/-   ##
=====================================
  Coverage   80.2%   80.2%           
=====================================
  Files        263     263           
  Lines      56831   56831           
=====================================
  Hits       45634   45634           
  Misses     11197   11197

@mergify mergify bot deleted the mergify/bp/v1.0/pr-8952 branch March 19, 2020 05:33
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