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

clap-utils: Fix signer resolution on Windows (backport #17343) #17371

Merged
merged 1 commit into from
May 21, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 21, 2021

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

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

You are currently cherry-picking commit e320af99a.
  (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:   clap-utils/src/keypair.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 May 21, 2021
@mergify
Copy link
Contributor Author

mergify bot commented May 21, 2021

automerge label removed due to a CI failure

(cherry picked from commit e320af9)

# Conflicts:
#	clap-utils/src/keypair.rs
@t-nelson t-nelson force-pushed the mergify/bp/v1.6/pr-17343 branch from 64ba1a4 to 4d409a2 Compare May 21, 2021 06:13
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 21, 2021
@codecov
Copy link

codecov bot commented May 21, 2021

Codecov Report

Merging #17371 (4d409a2) into v1.6 (3f6964d) will increase coverage by 0.0%.
The diff coverage is 85.7%.

@@           Coverage Diff           @@
##             v1.6   #17371   +/-   ##
=======================================
  Coverage    82.6%    82.6%           
=======================================
  Files         423      423           
  Lines      116118   116117    -1     
=======================================
+ Hits        95958    95970   +12     
+ Misses      20160    20147   -13     

@mergify mergify bot merged commit c3fafda into v1.6 May 21, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-17343 branch May 21, 2021 07:27
@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