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

Require program account to be writable in extend program data ix (backport #27911) #27978

Merged
merged 2 commits into from
Sep 22, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 22, 2022

This is an automatic backport of pull request #27911 done by Mergify.
Cherry-pick of 108b245 has failed:

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

You are currently cherry-picking commit 108b245e6.
  (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:
	deleted:    programs/bpf-loader-tests/tests/extend_program_data_ix.rs
	new file:   programs/bpf-loader-tests/tests/extend_program_ix.rs
	modified:   sdk/program/src/bpf_loader_upgradeable.rs
	modified:   sdk/program/src/loader_upgradeable_instruction.rs
	modified:   sdk/src/feature_set.rs
	modified:   transaction-status/src/parse_bpf_loader.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/bpf_loader/src/lib.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

)

* Require program account to be writable in extend program data ix

* feedback

(cherry picked from commit 108b245)

# Conflicts:
#	programs/bpf_loader/src/lib.rs
@mergify mergify bot added conflicts feature-gate Pull Request adds or modifies a runtime feature gate labels Sep 22, 2022
@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 Sep 22, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Sep 22, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 22, 2022
@mergify mergify bot merged commit 565aacc into v1.14 Sep 22, 2022
@mergify mergify bot deleted the mergify/bp/v1.14/pr-27911 branch September 22, 2022 06:10
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 conflicts feature-gate Pull Request adds or modifies a runtime feature gate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant