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

Refactor verify_and_update write privileges check (backport #18468) #18484

Merged
merged 1 commit into from
Jul 7, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 7, 2021

This is an automatic backport of pull request #18468 done by Mergify.
Cherry-pick of 72da25e has failed:

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

You are currently cherry-picking commit 72da25e9d.
  (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:   runtime/src/message_processor.rs
	both modified:   sdk/src/process_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 the conflicts label Jul 7, 2021
@jstarry jstarry self-assigned this Jul 7, 2021
@jstarry jstarry force-pushed the mergify/bp/v1.7/pr-18468 branch from 9461b5a to 00e408f Compare July 7, 2021 18:16
@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 7, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 7, 2021

automerge label removed due to a CI failure

@jstarry jstarry force-pushed the mergify/bp/v1.7/pr-18468 branch from 00e408f to 2885463 Compare July 7, 2021 19:02
@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 #18484 (2885463) into v1.7 (ef20559) will decrease coverage by 0.1%.
The diff coverage is 80.3%.

@@            Coverage Diff            @@
##             v1.7   #18484     +/-   ##
=========================================
- Coverage    82.5%    82.3%   -0.2%     
=========================================
  Files         428      432      +4     
  Lines      120239   121428   +1189     
=========================================
+ Hits        99199    99949    +750     
- Misses      21040    21479    +439     

@mergify mergify bot merged commit 2f633cd into v1.7 Jul 7, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-18468 branch July 7, 2021 21:46
@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