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

Bail on all CPI errors (bp #14500) #14506

Merged
merged 2 commits into from
Jan 10, 2021
Merged

Bail on all CPI errors (bp #14500) #14506

merged 2 commits into from
Jan 10, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 9, 2021

This is an automated backport of pull request #14500 done by Mergify

Cherry-pick of ec48631 has failed:

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

You are currently cherry-picking commit ec48631fc.
  (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:   programs/bpf/c/src/invoke/invoke.c
	modified:   programs/bpf/c/src/invoked/instruction.h
	modified:   programs/bpf/c/src/invoked/invoked.c
	modified:   programs/bpf/rust/invoked/src/instruction.rs
	modified:   programs/bpf/rust/invoked/src/processor.rs
	modified:   programs/bpf/tests/programs.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/bpf/rust/invoke/src/lib.rs
	both modified:   programs/bpf_loader/src/syscalls.rs
	both modified:   sdk/src/feature_set.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

@mergify mergify bot added the conflicts label Jan 9, 2021
* Bail on all CPI errors

* whitespace

(cherry picked from commit ec48631)
@jackcmay jackcmay force-pushed the mergify/bp/v1.4/pr-14500 branch from 84cc3c2 to 78a533b Compare January 9, 2021 03:51
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jan 9, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jan 9, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 10, 2021
@mergify mergify bot merged commit 6674025 into v1.4 Jan 10, 2021
@mergify mergify bot deleted the mergify/bp/v1.4/pr-14500 branch January 10, 2021 06:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant