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

Fix #21986 (backport #22035) #22049

Merged
merged 1 commit into from
Dec 21, 2021
Merged

Fix #21986 (backport #22035) #22049

merged 1 commit into from
Dec 21, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 21, 2021

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

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

You are currently cherry-picking commit ba8e15848.
  (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/rust/instruction_introspection/src/lib.rs
	modified:   programs/bpf/tests/programs.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   program-runtime/src/invoke_context.rs

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 labels Dec 21, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Dec 21, 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 21, 2021
* Partial revert "Updates documentation around what needs to be passed in CPI. (#21633)"

* Enforces the program_id being passed explicitly by removing it from get_instruction_keyed_accounts().

* instruction_accounts => instructions_account

(cherry picked from commit ba8e158)
@Lichtso Lichtso force-pushed the mergify/bp/v1.9/pr-22035 branch from 8f11343 to f292d9c Compare December 21, 2021 15:36
@Lichtso Lichtso added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Dec 21, 2021
@codecov
Copy link

codecov bot commented Dec 21, 2021

Codecov Report

Merging #22049 (f292d9c) into v1.9 (c296a6c) will decrease coverage by 0.0%.
The diff coverage is 100.0%.

@@            Coverage Diff            @@
##             v1.9   #22049     +/-   ##
=========================================
- Coverage    81.2%    81.2%   -0.1%     
=========================================
  Files         515      515             
  Lines      144238   144238             
=========================================
- Hits       117217   117214      -3     
- Misses      27021    27024      +3     

@mergify mergify bot merged commit 75fe0d3 into v1.9 Dec 21, 2021
@mergify mergify bot deleted the mergify/bp/v1.9/pr-22035 branch December 21, 2021 17:54
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Apr 4, 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 4, 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.

1 participant