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

build(deps): Bump github.com/spf13/pflag from 1.0.5 to 1.0.6 (backport #23555) #23560

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 30, 2025

Bumps github.com/spf13/pflag from 1.0.5 to 1.0.6.

Release notes

Sourced from github.com/spf13/pflag's releases.

v1.0.6

What's Changed

New Contributors

Full Changelog: spf13/pflag@v1.0.5...v1.0.6

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

This is an automatic backport of pull request #23555 done by [Mergify](https://mergify.com).

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 97c61cf)

# Conflicts:
#	client/v2/go.mod
#	client/v2/go.sum
#	go.sum
#	server/v2/cometbft/go.mod
#	server/v2/cometbft/go.sum
#	server/v2/go.mod
#	server/v2/go.sum
#	simapp/go.sum
#	simapp/v2/go.mod
#	systemtests/go.mod
#	systemtests/go.sum
#	tests/go.mod
#	tests/go.sum
#	tests/systemtests/go.mod
#	tests/systemtests/go.sum
#	tools/benchmark/go.mod
#	tools/benchmark/go.sum
#	tools/confix/go.mod
#	tools/confix/go.sum
#	tools/cosmovisor/go.mod
#	tools/cosmovisor/go.sum
#	tools/hubl/go.mod
#	tools/hubl/go.sum
#	x/accounts/defaults/base/go.mod
#	x/accounts/defaults/base/go.sum
#	x/accounts/defaults/lockup/go.mod
#	x/accounts/defaults/lockup/go.sum
#	x/accounts/defaults/multisig/go.mod
#	x/accounts/defaults/multisig/go.sum
#	x/accounts/go.mod
#	x/accounts/go.sum
#	x/authz/go.mod
#	x/authz/go.sum
#	x/bank/go.mod
#	x/bank/go.sum
#	x/circuit/go.sum
#	x/consensus/go.mod
#	x/consensus/go.sum
#	x/distribution/go.mod
#	x/distribution/go.sum
#	x/epochs/go.mod
#	x/epochs/go.sum
#	x/evidence/go.mod
#	x/evidence/go.sum
#	x/feegrant/go.mod
#	x/feegrant/go.sum
#	x/gov/go.mod
#	x/gov/go.sum
#	x/group/go.mod
#	x/group/go.sum
#	x/mint/go.mod
#	x/mint/go.sum
#	x/nft/go.sum
#	x/protocolpool/go.mod
#	x/protocolpool/go.sum
#	x/slashing/go.mod
#	x/slashing/go.sum
#	x/staking/go.mod
#	x/staking/go.sum
#	x/upgrade/go.mod
#	x/upgrade/go.sum
@mergify mergify bot requested a review from a team as a code owner January 30, 2025 14:58
@mergify mergify bot added the conflicts label Jan 30, 2025
Copy link
Contributor Author

mergify bot commented Jan 30, 2025

Cherry-pick of 97c61cf has failed:

On branch mergify/bp/release/v0.50.x/pr-23555
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 97c61cfb2.
  (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:   go.mod
	modified:   x/circuit/go.mod
	modified:   x/nft/go.mod

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   client/v2/go.mod
	both modified:   client/v2/go.sum
	both modified:   go.sum
	deleted by us:   server/v2/cometbft/go.mod
	deleted by us:   server/v2/cometbft/go.sum
	deleted by us:   server/v2/go.mod
	deleted by us:   server/v2/go.sum
	both modified:   simapp/go.sum
	deleted by us:   simapp/v2/go.mod
	deleted by us:   systemtests/go.mod
	deleted by us:   systemtests/go.sum
	both modified:   tests/go.mod
	both modified:   tests/go.sum
	deleted by us:   tests/systemtests/go.mod
	deleted by us:   tests/systemtests/go.sum
	deleted by us:   tools/benchmark/go.mod
	deleted by us:   tools/benchmark/go.sum
	both modified:   tools/confix/go.mod
	both modified:   tools/confix/go.sum
	both modified:   tools/cosmovisor/go.mod
	both modified:   tools/cosmovisor/go.sum
	both modified:   tools/hubl/go.mod
	both modified:   tools/hubl/go.sum
	deleted by us:   x/accounts/defaults/base/go.mod
	deleted by us:   x/accounts/defaults/base/go.sum
	deleted by us:   x/accounts/defaults/lockup/go.mod
	deleted by us:   x/accounts/defaults/lockup/go.sum
	deleted by us:   x/accounts/defaults/multisig/go.mod
	deleted by us:   x/accounts/defaults/multisig/go.sum
	deleted by us:   x/accounts/go.mod
	deleted by us:   x/accounts/go.sum
	deleted by us:   x/authz/go.mod
	deleted by us:   x/authz/go.sum
	deleted by us:   x/bank/go.mod
	deleted by us:   x/bank/go.sum
	both modified:   x/circuit/go.sum
	deleted by us:   x/consensus/go.mod
	deleted by us:   x/consensus/go.sum
	deleted by us:   x/distribution/go.mod
	deleted by us:   x/distribution/go.sum
	deleted by us:   x/epochs/go.mod
	deleted by us:   x/epochs/go.sum
	both modified:   x/evidence/go.mod
	both modified:   x/evidence/go.sum
	both modified:   x/feegrant/go.mod
	both modified:   x/feegrant/go.sum
	deleted by us:   x/gov/go.mod
	deleted by us:   x/gov/go.sum
	deleted by us:   x/group/go.mod
	deleted by us:   x/group/go.sum
	deleted by us:   x/mint/go.mod
	deleted by us:   x/mint/go.sum
	both modified:   x/nft/go.sum
	deleted by us:   x/protocolpool/go.mod
	deleted by us:   x/protocolpool/go.sum
	deleted by us:   x/slashing/go.mod
	deleted by us:   x/slashing/go.sum
	deleted by us:   x/staking/go.mod
	deleted by us:   x/staking/go.sum
	both modified:   x/upgrade/go.mod
	both modified:   x/upgrade/go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant