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

Add vote/stake checked instructions (backport #18345) #18456

Merged
merged 7 commits into from
Jul 7, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 6, 2021

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

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

You are currently cherry-picking commit ee219ffa4.
  (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/vote/src/vote_instruction.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   programs/stake/src/stake_instruction.rs
	deleted by us:   sdk/program/src/stake/instruction.rs
	both modified:   sdk/src/feature_set.rs

Cherry-pick of 9b302ac has failed:

On branch mergify/bp/v1.6/pr-18345
Your branch is ahead of 'origin/v1.6' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9b302ac0b.
  (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:   transaction-status/src/parse_stake.rs

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

Cherry-pick of 74e89a3 has failed:

On branch mergify/bp/v1.6/pr-18345
Your branch is ahead of 'origin/v1.6' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 74e89a3e3.
  (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/stake/src/stake_instruction.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://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 conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jul 6, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 6, 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 Jul 6, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 6, 2021

automerge label removed due to a CI failure

mvines and others added 7 commits July 6, 2021 19:15
(cherry picked from commit ee219ff)

# Conflicts:
#	programs/stake/src/stake_instruction.rs
#	sdk/program/src/stake/instruction.rs
#	sdk/src/feature_set.rs
(cherry picked from commit 544f62c)
(cherry picked from commit 9b302ac)

# Conflicts:
#	transaction-status/src/parse_stake.rs
(cherry picked from commit 39bac25)
(cherry picked from commit 74e89a3)

# Conflicts:
#	programs/stake/src/stake_instruction.rs
@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.6/pr-18345 branch from ac5da34 to 3b9b963 Compare July 7, 2021 01:16
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 7, 2021
@codecov
Copy link

codecov bot commented Jul 7, 2021

Codecov Report

Merging #18456 (3b9b963) into v1.6 (9413051) will decrease coverage by 0.6%.
The diff coverage is 78.8%.

@@            Coverage Diff            @@
##             v1.6   #18456     +/-   ##
=========================================
- Coverage    82.9%    82.3%   -0.7%     
=========================================
  Files         414      423      +9     
  Lines      114017   117698   +3681     
=========================================
+ Hits        94544    96881   +2337     
- Misses      19473    20817   +1344     

@mergify mergify bot merged commit 9a7ea12 into v1.6 Jul 7, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-18345 branch July 7, 2021 03:15
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant