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

The constraints on compute power a program can consume is limited only to its instruction count (bp #11717)#11800

Merged
mergify[bot] merged 3 commits intov1.3from
mergify/bp/v1.3/pr-11717
Aug 24, 2020
Merged

The constraints on compute power a program can consume is limited only to its instruction count (bp #11717)#11800
mergify[bot] merged 3 commits intov1.3from
mergify/bp/v1.3/pr-11717

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Aug 24, 2020

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

Cherry-pick of 8d362f6 has failed:

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

You are currently cherry-picking commit 8d362f682.
  (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.lock
	modified:   genesis-programs/src/lib.rs
	modified:   programs/bpf/Cargo.lock
	modified:   programs/bpf/benches/bpf_loader.rs
	modified:   programs/bpf/c/src/invoke/invoke.c
	modified:   programs/bpf/c/src/invoked/invoked.c
	modified:   programs/bpf/rust/invoke/src/lib.rs
	modified:   programs/bpf/rust/invoked/src/lib.rs
	modified:   programs/bpf/tests/programs.rs
	modified:   runtime/src/message_processor.rs
	modified:   sdk/src/entrypoint_native.rs

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

	both modified:   programs/bpf/Cargo.toml
	both modified:   programs/bpf_loader/Cargo.toml
	both modified:   programs/bpf_loader/src/lib.rs
	both modified:   programs/bpf_loader/src/syscalls.rs
	both modified:   runtime/src/bank.rs
	both modified:   sdk/src/instruction.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/

@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Aug 24, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 24, 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 24, 2020
…y to its instruction count (#11717)

(cherry picked from commit 8d362f6)

# Conflicts:
#	programs/bpf/Cargo.toml
#	programs/bpf_loader/Cargo.toml
#	programs/bpf_loader/src/lib.rs
#	programs/bpf_loader/src/syscalls.rs
#	runtime/src/bank.rs
#	sdk/src/instruction.rs
@jackcmay jackcmay force-pushed the mergify/bp/v1.3/pr-11717 branch from 314049d to 4d4feb3 Compare August 24, 2020 16:14
@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 24, 2020

Codecov Report

Merging #11800 into v1.3 will decrease coverage by 0.0%.
The diff coverage is 59.8%.

@@           Coverage Diff            @@
##            v1.3   #11800     +/-   ##
========================================
- Coverage   82.0%    82.0%   -0.1%     
========================================
  Files        329      329             
  Lines      77010    77099     +89     
========================================
+ Hits       63217    63277     +60     
- Misses     13793    13822     +29     

@mergify mergify Bot merged commit 0dcbc6d into v1.3 Aug 24, 2020
@mergify mergify Bot deleted the mergify/bp/v1.3/pr-11717 branch August 24, 2020 17:27
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