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

Remove frozen ABI modules from solana-sdk (bp #13008)#13036

Merged
mergify[bot] merged 3 commits intov1.4from
mergify/bp/v1.4/pr-13008
Oct 21, 2020
Merged

Remove frozen ABI modules from solana-sdk (bp #13008)#13036
mergify[bot] merged 3 commits intov1.4from
mergify/bp/v1.4/pr-13008

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Oct 20, 2020

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

Cherry-pick of 6858950 has failed:

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

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

Changes to be committed:

	modified:   Cargo.toml
	modified:   core/build.rs
	modified:   core/src/lib.rs
	new file:   frozen-abi/Cargo.toml
	copied:     sdk/build.rs -> frozen-abi/build.rs
	renamed:    sdk/macro-frozen-abi/build.rs -> frozen-abi/macro/build.rs
	renamed:    sdk/macro-frozen-abi/src/lib.rs -> frozen-abi/macro/src/lib.rs
	renamed:    sdk/src/abi_digester.rs -> frozen-abi/src/abi_digester.rs
	renamed:    sdk/src/abi_example.rs -> frozen-abi/src/abi_example.rs
	new file:   frozen-abi/src/hash.rs
	new file:   frozen-abi/src/lib.rs
	modified:   programs/stake/build.rs
	modified:   programs/stake/src/lib.rs
	modified:   programs/vote/build.rs
	modified:   programs/vote/src/lib.rs
	modified:   runtime/build.rs
	modified:   runtime/src/accounts_db.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/lib.rs
	modified:   runtime/src/message_processor.rs
	modified:   runtime/src/serde_snapshot.rs
	modified:   runtime/src/serde_snapshot/future.rs
	modified:   runtime/src/serde_snapshot/tests.rs
	modified:   runtime/src/serde_snapshot/utils.rs
	typechange: sdk/build.rs
	deleted:    sdk/macro-frozen-abi/Cargo.toml
	modified:   sdk/src/lib.rs
	new file:   test-abi.sh
	modified:   version/build.rs
	modified:   version/src/lib.rs

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

	both modified:   Cargo.lock
	both modified:   core/Cargo.toml
	both modified:   frozen-abi/macro/Cargo.toml
	both modified:   programs/bpf/Cargo.lock
	both modified:   programs/stake/Cargo.toml
	both modified:   programs/vote/Cargo.toml
	both modified:   runtime/Cargo.toml
	both modified:   sdk/Cargo.toml
	both modified:   version/Cargo.toml

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 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 6858950)

# Conflicts:
#	Cargo.lock
#	core/Cargo.toml
#	frozen-abi/macro/Cargo.toml
#	programs/bpf/Cargo.lock
#	programs/stake/Cargo.toml
#	programs/vote/Cargo.toml
#	runtime/Cargo.toml
#	sdk/Cargo.toml
#	version/Cargo.toml
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Oct 20, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 20, 2020

automerge label removed due to a CI failure

@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Oct 20, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 20, 2020

automerge label removed due to a CI failure

@mvines mvines force-pushed the mergify/bp/v1.4/pr-13008 branch 2 times, most recently from 7fc1339 to b2db16d Compare October 20, 2020 23:28
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Oct 20, 2020
@mvines mvines force-pushed the mergify/bp/v1.4/pr-13008 branch from b2db16d to 27f2557 Compare October 20, 2020 23:30
@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Oct 20, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 20, 2020

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Oct 20, 2020
@mvines
Copy link
Copy Markdown
Contributor

mvines commented Oct 21, 2020

@ryoqun - I added #13039 to this PR as well.

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 21, 2020

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Oct 21, 2020
@ryoqun ryoqun added the automerge Merge this Pull Request automatically once CI passes label Oct 21, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Oct 21, 2020

Codecov Report

Merging #13036 into v1.4 will decrease coverage by 0.0%.
The diff coverage is 70.8%.

@@           Coverage Diff            @@
##            v1.4   #13036     +/-   ##
========================================
- Coverage   82.0%    82.0%   -0.1%     
========================================
  Files        362      364      +2     
  Lines      85355    85362      +7     
========================================
- Hits       70044    70037      -7     
- Misses     15311    15325     +14     

@mergify mergify Bot merged commit b143b9c into v1.4 Oct 21, 2020
@mergify mergify Bot deleted the mergify/bp/v1.4/pr-13008 branch October 21, 2020 02:00
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