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

v1.18: Fix - test_feature_activation_loaded_programs_recompilation_phase() (backport of #35299) #35403

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 2, 2024

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

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

You are currently cherry-picking commit ccc6a6bf6f.
  (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:   runtime/src/bank/tests.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   program-runtime/src/loaded_programs.rs

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

…#35299)

* Fixes test_feature_activation_loaded_programs_recompilation_phase() to trigger the recompilation phase before the epoch boundary.

* Adds a direct check of the cached entries around recompilation.

(cherry picked from commit ccc6a6b)

# Conflicts:
#	program-runtime/src/loaded_programs.rs
@mergify mergify bot added the conflicts label Mar 2, 2024
@mergify mergify bot assigned pgarg66 Mar 2, 2024
Copy link
Contributor Author

mergify bot commented Mar 2, 2024

Cherry-pick of ccc6a6b has failed:

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

You are currently cherry-picking commit ccc6a6bf6f.
  (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:   runtime/src/bank/tests.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   program-runtime/src/loaded_programs.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@willhickey
Copy link
Contributor

This repository is no longer in use. Please re-open this pull request in the agave repo: https://github.com/anza-xyz/agave

@willhickey willhickey closed this Mar 3, 2024
@mergify mergify bot deleted the mergify/bp/v1.18/pr-35299 branch March 3, 2024 04:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants