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

v1.14: Fix keygen usb panic (debug only) (backport of #31194) #31195

Merged
merged 2 commits into from
Apr 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 14, 2023

This is an automatic backport of pull request #31194 done by Mergify.
Cherry-pick of 2147f0d has failed:

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

You are currently cherry-picking commit 2147f0d05.
  (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:   clap-v3-utils/src/keypair.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   clap-v3-utils/Cargo.toml

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

* Bump clap v3

* Use fallible method to check for confirm_key

(cherry picked from commit 2147f0d)

# Conflicts:
#	Cargo.lock
#	clap-v3-utils/Cargo.toml
@CriesofCarrots CriesofCarrots added the CI Pull Request is ready to enter CI label Apr 14, 2023
@solana-grimes solana-grimes removed the CI Pull Request is ready to enter CI label Apr 14, 2023
@yihau yihau added the CI Pull Request is ready to enter CI label Apr 14, 2023
@solana-grimes solana-grimes removed the CI Pull Request is ready to enter CI label Apr 14, 2023
@CriesofCarrots CriesofCarrots requested a review from t-nelson April 14, 2023 15:13
@CriesofCarrots
Copy link
Contributor

I'm requesting backport on this because the bug was introduced in v1.14 (v1.11, really). But I don't feel that strongly about it.

@CriesofCarrots CriesofCarrots merged commit b76da8b into v1.14 Apr 14, 2023
@CriesofCarrots CriesofCarrots deleted the mergify/bp/v1.14/pr-31194 branch April 14, 2023 20:48
bw-solana pushed a commit to bw-solana/solana that referenced this pull request Jan 10, 2025
…) (solana-labs#31195)

* Fix keygen usb panic (debug only) (solana-labs#31194)

* Bump clap v3

* Use fallible method to check for confirm_key

(cherry picked from commit 2147f0d)

* Fix conflicts

---------

Co-authored-by: Tyera <tyera@solana.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants