Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cache executors on failed transactions (backport #22308) #22327

Merged
merged 2 commits into from Jan 6, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 6, 2022

This is an automatic backport of pull request #22308 done by Mergify.
Cherry-pick of 12e1602 has failed:

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

You are currently cherry-picking commit 12e160269.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   program-runtime/src/invoke_context.rs
	both modified:   programs/bpf_loader/src/lib.rs
	both modified:   runtime/src/bank.rs

no changes added to commit (use "git add" and/or "git commit -a")

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 12e1602)

# Conflicts:
#	program-runtime/src/invoke_context.rs
#	programs/bpf_loader/src/lib.rs
#	runtime/src/bank.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jan 6, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jan 6, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 6, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jan 6, 2022

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 Jan 6, 2022
@codecov
Copy link

codecov bot commented Jan 6, 2022

Codecov Report

Merging #22327 (277e274) into v1.8 (e0d933f) will decrease coverage by 0.0%.
The diff coverage is 95.6%.

@@            Coverage Diff            @@
##             v1.8   #22327     +/-   ##
=========================================
- Coverage    81.6%    81.5%   -0.1%     
=========================================
  Files         459      459             
  Lines      130957   130974     +17     
=========================================
- Hits       106868   106847     -21     
- Misses      24089    24127     +38     

@jackcmay jackcmay merged commit cad0e7f into v1.8 Jan 6, 2022
@jackcmay jackcmay deleted the mergify/bp/v1.8/pr-22308 branch January 6, 2022 23:38
@github-actions
Copy link
Contributor

github-actions bot commented Apr 2, 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 2, 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.

None yet

1 participant