Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Bump borsh from 0.8.1 to 0.9.0 (backport #18230) #18237

Merged
merged 2 commits into from
Jun 25, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 25, 2021

This is an automatic backport of pull request #18230 done by Mergify.
Cherry-pick of 7ed2cf3 has failed:

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

You are currently cherry-picking commit 7ed2cf30a.
  (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:   Cargo.lock
	modified:   banks-client/Cargo.toml
	modified:   sdk/program/Cargo.toml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/bpf/Cargo.lock

To fix up this pull request, you can check it out 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 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.io/

(cherry picked from commit 7ed2cf3)

# Conflicts:
#	programs/bpf/Cargo.lock
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jun 25, 2021
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jun 25, 2021
@solana-grimes
Copy link
Contributor

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

@CriesofCarrots CriesofCarrots added the automerge Merge this Pull Request automatically once CI passes label Jun 25, 2021
@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jun 25, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 25, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 25, 2021
@codecov
Copy link

codecov bot commented Jun 25, 2021

Codecov Report

Merging #18237 (cc2f119) into v1.6 (12eea11) will increase coverage by 0.0%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             v1.6   #18237   +/-   ##
=======================================
  Coverage    82.5%    82.5%           
=======================================
  Files         424      424           
  Lines      117353   117353           
=======================================
+ Hits        96884    96901   +17     
+ Misses      20469    20452   -17     

@mergify mergify bot merged commit 6b9a529 into v1.6 Jun 25, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-18230 branch June 25, 2021 23:10
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants