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

Reduce payer balance needed to deploy programs (backport #19645) #19998

Merged
merged 2 commits into from
Sep 18, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 18, 2021

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

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

You are currently cherry-picking commit efd024510.
  (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:   programs/bpf_loader/src/lib.rs

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.io/

* Reduce payer balance needed to deploy programs

* Fix test and unbalanced ix error

* fix test

* fix up tests

(cherry picked from commit efd0245)

# Conflicts:
#	programs/bpf_loader/src/lib.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Sep 18, 2021
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Sep 18, 2021
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 18, 2021
@jstarry
Copy link
Member

jstarry commented Sep 18, 2021

@jackcmay fyi this didn't get into v1.7.12 with the native write privileges fix, so we'll have to treat the feature switch as if it got into v1.7.13. Does that seem sane?

@jackcmay
Copy link
Contributor

Yup or this can use a different switch

@jstarry
Copy link
Member

jstarry commented Sep 18, 2021

yeah a new switch seems more sane, I'll do that

@mergify
Copy link
Contributor Author

mergify bot commented Sep 18, 2021

automerge label removed due to a CI failure

@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 18, 2021
@codecov
Copy link

codecov bot commented Sep 18, 2021

Codecov Report

Merging #19998 (f89383f) into v1.7 (3e870a4) will increase coverage by 0.0%.
The diff coverage is 88.8%.

@@           Coverage Diff           @@
##             v1.7   #19998   +/-   ##
=======================================
  Coverage    82.2%    82.2%           
=======================================
  Files         439      439           
  Lines      124898   124917   +19     
=======================================
+ Hits       102721   102739   +18     
- Misses      22177    22178    +1     

@mergify mergify bot merged commit d0143da into v1.7 Sep 18, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-19645 branch September 18, 2021 04:46
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.

3 participants