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.16: Bump solana_rbpf to v0.6.0 (backport of #32313) #32383

Merged
merged 1 commit into from
Jul 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 5, 2023

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

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

You are currently cherry-picking commit 9731331be4.
  (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:   Cargo.lock
	modified:   ledger-tool/src/program.rs
	modified:   program-runtime/src/invoke_context.rs
	modified:   programs/bpf_loader/src/lib.rs
	modified:   programs/bpf_loader/src/syscalls/cpi.rs
	modified:   programs/bpf_loader/src/syscalls/mem_ops.rs
	modified:   programs/loader-v4/src/lib.rs
	modified:   programs/sbf/Cargo.lock
	modified:   programs/sbf/benches/bpf_loader.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.toml
	both modified:   programs/bpf_loader/src/syscalls/mod.rs
	both modified:   programs/sbf/Cargo.toml

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

@mergify mergify bot added conflicts feature-gate Pull Request adds or modifies a runtime feature gate labels Jul 5, 2023
@mergify mergify bot assigned Lichtso Jul 5, 2023
(cherry picked from commit 9731331)
@Lichtso Lichtso force-pushed the mergify/bp/v1.16/pr-32313 branch from 9a52773 to 91ed2d9 Compare July 5, 2023 21:21
@codecov
Copy link

codecov bot commented Jul 5, 2023

Codecov Report

Merging #32383 (91ed2d9) into v1.16 (debdfdd) will increase coverage by 0.0%.
The diff coverage is 98.2%.

@@           Coverage Diff           @@
##            v1.16   #32383   +/-   ##
=======================================
  Coverage    81.9%    81.9%           
=======================================
  Files         762      762           
  Lines      207573   207582    +9     
=======================================
+ Hits       170085   170108   +23     
+ Misses      37488    37474   -14     

@Lichtso Lichtso requested a review from pgarg66 July 5, 2023 23:17
@Lichtso Lichtso removed conflicts feature-gate Pull Request adds or modifies a runtime feature gate labels Jul 5, 2023
@Lichtso Lichtso merged commit f0fa648 into v1.16 Jul 6, 2023
@Lichtso Lichtso deleted the mergify/bp/v1.16/pr-32313 branch July 6, 2023 00:33
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