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

v1.18: Add limit to looping in banking-stage (backport of #35342) #35364

Merged
merged 1 commit into from
Feb 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 29, 2024

This is an automatic backport of pull request #35342 done by Mergify.
Cherry-pick of 990ca1d has failed:

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

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

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   runtime/src/bank.rs
	deleted by us:   svm/src/transaction_processor.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

@mergify mergify bot added the conflicts label Feb 29, 2024
Copy link
Contributor Author

mergify bot commented Feb 29, 2024

Cherry-pick of 990ca1d has failed:

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

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

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   runtime/src/bank.rs
	deleted by us:   svm/src/transaction_processor.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

@pgarg66 pgarg66 force-pushed the mergify/bp/v1.18/pr-35342 branch from 259692f to 5ba1292 Compare February 29, 2024 02:14
@pgarg66 pgarg66 removed the conflicts label Feb 29, 2024
@pgarg66
Copy link
Contributor

pgarg66 commented Feb 29, 2024

The conflicats had to be manually resolved due to code refactoring on master.

Copy link

codecov bot commented Feb 29, 2024

Codecov Report

Attention: Patch coverage is 37.50000% with 10 lines in your changes are missing coverage. Please review.

Project coverage is 81.6%. Comparing base (e302417) to head (5ba1292).
Report is 2 commits behind head on v1.18.

Additional details and impacted files
@@            Coverage Diff            @@
##            v1.18   #35364     +/-   ##
=========================================
- Coverage    81.6%    81.6%   -0.1%     
=========================================
  Files         827      827             
  Lines      224160   224194     +34     
=========================================
- Hits       183006   182986     -20     
- Misses      41154    41208     +54     

@pgarg66 pgarg66 requested a review from sakridge February 29, 2024 16:06
@pgarg66 pgarg66 merged commit 4da0e28 into v1.18 Feb 29, 2024
36 checks passed
@pgarg66 pgarg66 deleted the mergify/bp/v1.18/pr-35342 branch February 29, 2024 22:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants