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

Count compute units even when transaction errors (backport #22182) #22199

Merged
merged 2 commits into from
Dec 31, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 31, 2021

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

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

You are currently cherry-picking commit d06e6c742.
  (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:   core/src/cost_update_service.rs
	modified:   program-runtime/src/timings.rs
	modified:   program-test/src/lib.rs
	modified:   programs/bpf_loader/src/syscalls.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   program-runtime/src/invoke_context.rs
	both modified:   runtime/src/cost_model.rs
	both modified:   runtime/src/message_processor.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

(cherry picked from commit d06e6c7)

# Conflicts:
#	program-runtime/src/invoke_context.rs
#	runtime/src/cost_model.rs
#	runtime/src/message_processor.rs
@mergify mergify bot added the conflicts label Dec 31, 2021
@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 Dec 31, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Dec 31, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Dec 31, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Dec 31, 2021

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 Dec 31, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Dec 31, 2021

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 Dec 31, 2021
@codecov
Copy link

codecov bot commented Dec 31, 2021

Codecov Report

Merging #22199 (6f169d7) into v1.9 (c6ab915) will increase coverage by 0.0%.
The diff coverage is 97.2%.

@@           Coverage Diff            @@
##             v1.9   #22199    +/-   ##
========================================
  Coverage    81.1%    81.1%            
========================================
  Files         518      518            
  Lines      144814   144957   +143     
========================================
+ Hits       117456   117583   +127     
- Misses      27358    27374    +16     

@mergify mergify bot merged commit 113d261 into v1.9 Dec 31, 2021
@mergify mergify bot deleted the mergify/bp/v1.9/pr-22182 branch December 31, 2021 21:14
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Apr 3, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 3, 2022
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 locked PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant