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

Make BPF Loader static (bp #11516)#11865

Merged
mergify[bot] merged 3 commits intov1.2from
mergify/bp/v1.2/pr-11516
Aug 27, 2020
Merged

Make BPF Loader static (bp #11516)#11865
mergify[bot] merged 3 commits intov1.2from
mergify/bp/v1.2/pr-11516

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Aug 26, 2020

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

Cherry-pick of 7c736f7 has failed:

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

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

Changes to be committed:

	modified:   genesis-programs/src/lib.rs
	modified:   ledger/src/blockstore_processor.rs
	modified:   local-cluster/src/local_cluster.rs
	modified:   programs/bpf/Cargo.lock
	modified:   programs/bpf_loader/Cargo.toml
	modified:   programs/bpf_loader/src/deprecated.rs
	modified:   programs/bpf_loader/src/lib.rs
	modified:   runtime/src/bank.rs
	new file:   runtime/src/builtins.rs
	modified:   runtime/src/message_processor.rs
	new file:   sdk/src/builtins.rs
	modified:   sdk/src/entrypoint_native.rs
	modified:   sdk/src/lib.rs

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

	both modified:   Cargo.lock
	both modified:   core/Cargo.toml
	both modified:   core/src/lib.rs
	both modified:   core/src/validator.rs
	both modified:   genesis/src/main.rs
	both modified:   programs/bpf/tests/programs.rs
	deleted by them: runtime/src/builtin_programs.rs
	both modified:   runtime/src/lib.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 7c736f7)

# Conflicts:
#	Cargo.lock
#	core/Cargo.toml
#	core/src/lib.rs
#	core/src/validator.rs
#	genesis/src/main.rs
#	programs/bpf/tests/programs.rs
#	runtime/src/builtin_programs.rs
#	runtime/src/lib.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Aug 26, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 26, 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 Aug 26, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 26, 2020

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Aug 26, 2020
@jackcmay jackcmay force-pushed the mergify/bp/v1.2/pr-11516 branch from 7988970 to 6751210 Compare August 26, 2020 22:48
@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 Aug 26, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 26, 2020

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Aug 26, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 27, 2020

Codecov Report

Merging #11865 into v1.2 will decrease coverage by 0.0%.
The diff coverage is 92.0%.

@@           Coverage Diff            @@
##            v1.2   #11865     +/-   ##
========================================
- Coverage   82.0%    82.0%   -0.1%     
========================================
  Files        322      322             
  Lines      76855    76908     +53     
========================================
+ Hits       63093    63129     +36     
- Misses     13762    13779     +17     

@mergify mergify Bot merged commit 81db361 into v1.2 Aug 27, 2020
@mergify mergify Bot deleted the mergify/bp/v1.2/pr-11516 branch August 27, 2020 01:00
jackcmay added a commit to jackcmay/solana that referenced this pull request Aug 27, 2020
mergify Bot pushed a commit that referenced this pull request Aug 27, 2020
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.

1 participant