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

v1.16: Bump solana_rbpf to v0.5.0 (backport of #31943) #31944

Merged
merged 1 commit into from
Jun 2, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 2, 2023

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

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

You are currently cherry-picking commit 379220459.
  (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:   program-runtime/src/invoke_context.rs
	modified:   program-runtime/src/loaded_programs.rs
	modified:   programs/bpf_loader/src/lib.rs
	modified:   programs/bpf_loader/src/syscalls/mod.rs
	modified:   programs/loader-v4/src/lib.rs
	modified:   programs/sbf/Cargo.lock

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.toml
	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 the conflicts label Jun 2, 2023
@mergify mergify bot assigned Lichtso Jun 2, 2023
@codecov
Copy link

codecov bot commented Jun 2, 2023

Codecov Report

Merging #31944 (0c042ec) into v1.16 (1934004) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##            v1.16   #31944   +/-   ##
=======================================
  Coverage    81.9%    81.9%           
=======================================
  Files         758      758           
  Lines      207121   207121           
=======================================
+ Hits       169660   169696   +36     
+ Misses      37461    37425   -36     

* Renames RBPF BuiltIn to Builtin.

* Bump solana_rbpf to v0.5.0

(cherry picked from commit 3792204)
@Lichtso Lichtso force-pushed the mergify/bp/v1.16/pr-31943 branch from 65bfaaf to 0c042ec Compare June 2, 2023 15:12
@Lichtso Lichtso requested a review from pgarg66 June 2, 2023 15:25
@Lichtso Lichtso merged commit 618fd3f into v1.16 Jun 2, 2023
@Lichtso Lichtso deleted the mergify/bp/v1.16/pr-31943 branch June 2, 2023 18:11
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.

2 participants