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

Stop caching sysvars, instead load them ahead of time (backport #21108)#22466

Merged
mergify[bot] merged 2 commits intov1.8from
mergify/bp/v1.8/pr-21108
Jan 13, 2022
Merged

Stop caching sysvars, instead load them ahead of time (backport #21108)#22466
mergify[bot] merged 2 commits intov1.8from
mergify/bp/v1.8/pr-21108

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jan 12, 2022

This is an automatic backport of pull request #21108 done by Mergify.
Cherry-pick of 29ad081 has failed:

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

You are currently cherry-picking commit 29ad08155.
  (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 <file>..." to mark resolution)
	both modified:   programs/bpf/tests/programs.rs
	both modified:   programs/bpf_loader/src/syscalls.rs
	both modified:   programs/stake/src/stake_instruction.rs
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/message_processor.rs
	both modified:   sdk/program/src/sysvar/mod.rs
	both modified:   sdk/src/process_instruction.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 29ad081)

# Conflicts:
#	programs/bpf/tests/programs.rs
#	programs/bpf_loader/src/syscalls.rs
#	programs/stake/src/stake_instruction.rs
#	runtime/src/bank.rs
#	runtime/src/message_processor.rs
#	sdk/program/src/sysvar/mod.rs
#	sdk/src/process_instruction.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jan 12, 2022
@jstarry jstarry self-assigned this Jan 12, 2022
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 13, 2022
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 13, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 13, 2022

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Jan 13, 2022
@jstarry jstarry force-pushed the mergify/bp/v1.8/pr-21108 branch from 5aab283 to f799cd8 Compare January 13, 2022 15:45
@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 13, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 13, 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 13, 2022
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 13, 2022

Codecov Report

Merging #22466 (f799cd8) into v1.8 (05e75ae) will increase coverage by 0.0%.
The diff coverage is 84.6%.

@@           Coverage Diff           @@
##             v1.8   #22466   +/-   ##
=======================================
  Coverage    81.6%    81.6%           
=======================================
  Files         459      459           
  Lines      131185   131140   -45     
=======================================
- Hits       107049   107026   -23     
+ Misses      24136    24114   -22     

@mergify mergify Bot merged commit 5d3f3bc into v1.8 Jan 13, 2022
@mergify mergify Bot deleted the mergify/bp/v1.8/pr-21108 branch January 13, 2022 17:51
jstarry added a commit that referenced this pull request Jan 14, 2022
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 1, 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 1, 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.

3 participants