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

v1.17: Refactor - LoadedPrograms part 2 (backport of #33694) #33695

Merged
merged 2 commits into from
Oct 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 13, 2023

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

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

You are currently cherry-picking commit a3f85aba21.
  (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:   program-runtime/src/loaded_programs.rs
	modified:   runtime/src/bank.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/bank/tests.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 a3f85ab)

# Conflicts:
#	runtime/src/bank/tests.rs
@pgarg66 pgarg66 force-pushed the mergify/bp/v1.17/pr-33694 branch from 6e2f2f4 to 27b7f1d Compare October 13, 2023 20:30
@pgarg66 pgarg66 added the automerge Merge this Pull Request automatically once CI passes label Oct 13, 2023
@codecov
Copy link

codecov bot commented Oct 13, 2023

Codecov Report

Merging #33695 (27b7f1d) into v1.17 (10b00df) will increase coverage by 0.0%.
The diff coverage is 92.1%.

@@           Coverage Diff           @@
##            v1.17   #33695   +/-   ##
=======================================
  Coverage    81.7%    81.7%           
=======================================
  Files         804      804           
  Lines      218112   218124   +12     
=======================================
+ Hits       178362   178399   +37     
+ Misses      39750    39725   -25     

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Oct 13, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Oct 13, 2023

automerge label removed due to a CI failure

@pgarg66 pgarg66 added the automerge Merge this Pull Request automatically once CI passes label Oct 13, 2023
@mergify mergify bot merged commit 02f9c97 into v1.17 Oct 13, 2023
17 checks passed
@mergify mergify bot deleted the mergify/bp/v1.17/pr-33694 branch October 13, 2023 22:00
@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Oct 13, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Oct 13, 2023

automerge label removed due to a CI failure

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants