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

Bump solana_rbpf to version v0.2.18 (backport #21774)#21786

Merged
mergify[bot] merged 1 commit intov1.9from
mergify/bp/v1.9/pr-21774
Dec 11, 2021
Merged

Bump solana_rbpf to version v0.2.18 (backport #21774)#21786
mergify[bot] merged 1 commit intov1.9from
mergify/bp/v1.9/pr-21774

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 10, 2021

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

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

You are currently cherry-picking commit a5a0dabe7.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   cli/Cargo.toml
	both modified:   programs/bpf/Cargo.lock
	both modified:   programs/bpf/Cargo.toml
	both modified:   programs/bpf_loader/Cargo.toml
	both modified:   rbpf-cli/Cargo.toml

no changes added to commit (use "git add" and/or "git commit -a")

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 automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Dec 10, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 10, 2021

automerge label removed due to a CI failure

@Lichtso Lichtso force-pushed the mergify/bp/v1.9/pr-21774 branch from 523fe33 to e8f6264 Compare December 10, 2021 21:52
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 10, 2021
@Lichtso Lichtso removed the conflicts label Dec 10, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 11, 2021

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 11, 2021
@tao-stones tao-stones added the automerge Merge this Pull Request automatically once CI passes label Dec 11, 2021
@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 11, 2021

Codecov Report

Merging #21786 (e8f6264) into v1.9 (68fc72a) will increase coverage by 0.0%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             v1.9   #21786   +/-   ##
=======================================
  Coverage    81.4%    81.4%           
=======================================
  Files         511      511           
  Lines      143176   143176           
=======================================
+ Hits       116619   116625    +6     
+ Misses      26557    26551    -6     

@mergify mergify Bot merged commit 2c4765e into v1.9 Dec 11, 2021
@mergify mergify Bot deleted the mergify/bp/v1.9/pr-21774 branch December 11, 2021 02:38
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 5, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 5, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants