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

Use consistent naming for compute unit limit (backport #25229) #25312

Merged
merged 2 commits into from
May 18, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 18, 2022

This is an automatic backport of pull request #25229 done by Mergify.
Cherry-pick of a1522d0 has failed:

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

You are currently cherry-picking commit a1522d002.
  (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:   docs/src/developing/programming-model/runtime.md
	modified:   program-runtime/src/compute_budget.rs
	modified:   program-runtime/src/invoke_context.rs
	modified:   program-runtime/src/prioritization_fee.rs
	modified:   program-test/src/lib.rs
	modified:   programs/bpf/tests/programs.rs
	modified:   runtime/src/bank.rs
	modified:   sdk/src/compute_budget.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/cost_model.rs
	both modified:   runtime/src/execute_cost_table.rs
	both modified:   test-validator/src/lib.rs
	both modified:   validator/src/bin/solana-test-validator.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

* Use consistent naming for compute unit limit

* feedback

(cherry picked from commit a1522d0)

# Conflicts:
#	runtime/src/cost_model.rs
#	runtime/src/execute_cost_table.rs
#	test-validator/src/lib.rs
#	validator/src/bin/solana-test-validator.rs
@mergify mergify bot added the conflicts label May 18, 2022
@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 May 18, 2022
@mergify
Copy link
Contributor Author

mergify bot commented May 18, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 18, 2022
@codecov
Copy link

codecov bot commented May 18, 2022

Codecov Report

Merging #25312 (4bdbcf2) into v1.10 (d1bde17) will increase coverage by 0.0%.
The diff coverage is 84.0%.

@@            Coverage Diff            @@
##            v1.10   #25312     +/-   ##
=========================================
  Coverage    81.5%    81.5%             
=========================================
  Files         588      591      +3     
  Lines      160624   161687   +1063     
=========================================
+ Hits       130961   131849    +888     
- Misses      29663    29838    +175     

@jstarry jstarry merged commit 45dd8df into v1.10 May 18, 2022
@jstarry jstarry deleted the mergify/bp/v1.10/pr-25229 branch May 18, 2022 09:47
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