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

Make default programs static (bp #9717) #9814

Merged
merged 4 commits into from
Apr 30, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 30, 2020

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

Cherry-pick of efad193 has failed:

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

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

Changes to be committed:

	modified:   bench-exchange/tests/bench_exchange.rs
	modified:   genesis-programs/src/lib.rs
	modified:   genesis/src/main.rs
	modified:   ledger/src/snapshot_utils.rs
	modified:   local-cluster/src/local_cluster.rs
	modified:   programs/budget/src/budget_processor.rs
	modified:   programs/config/Cargo.toml
	modified:   programs/config/src/lib.rs
	modified:   programs/exchange/src/exchange_processor.rs
	modified:   programs/failure/tests/failure.rs
	modified:   programs/ownable/src/ownable_processor.rs
	modified:   programs/stake/Cargo.toml
	modified:   programs/stake/src/lib.rs
	modified:   programs/vest/src/vest_processor.rs
	modified:   programs/vote/Cargo.toml
	modified:   programs/vote/src/lib.rs
	modified:   runtime/benches/bank.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/lib.rs
	modified:   runtime/src/storage_utils.rs
	modified:   runtime/tests/noop.rs
	modified:   runtime/tests/stake.rs
	modified:   runtime/tests/storage.rs
	modified:   sdk/src/genesis_config.rs
	modified:   sdk/src/system_program.rs
	modified:   stake-accounts/src/stake_accounts.rs

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

	both modified:   Cargo.lock
	both modified:   genesis-programs/Cargo.toml
	both modified:   programs/bpf/Cargo.lock
	both modified:   programs/librapay/Cargo.lock
	both modified:   programs/librapay/src/librapay_transaction.rs
	both modified:   runtime/Cargo.toml
	both modified:   runtime/src/genesis_utils.rs
	both modified:   runtime/src/message_processor.rs

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 simulator.

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

(cherry picked from commit efad193)

# Conflicts:
#	Cargo.lock
#	genesis-programs/Cargo.toml
#	programs/bpf/Cargo.lock
#	programs/librapay/Cargo.lock
#	programs/librapay/src/librapay_transaction.rs
#	runtime/Cargo.toml
#	runtime/src/genesis_utils.rs
#	runtime/src/message_processor.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Apr 30, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Apr 30, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 30, 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 Apr 30, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 30, 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 Apr 30, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 30, 2020
@solana-grimes solana-grimes merged commit 892abd2 into v1.1 Apr 30, 2020
@codecov
Copy link

codecov bot commented Apr 30, 2020

Codecov Report

Merging #9814 into v1.1 will decrease coverage by 0.0%.
The diff coverage is 93.0%.

@@           Coverage Diff           @@
##            v1.1   #9814     +/-   ##
=======================================
- Coverage   80.7%   80.7%   -0.1%     
=======================================
  Files        279     280      +1     
  Lines      63761   63762      +1     
=======================================
- Hits       51474   51469      -5     
- Misses     12287   12293      +6     

@mergify mergify bot deleted the mergify/bp/v1.1/pr-9717 branch April 30, 2020 09:51
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