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

feat(gov,cli): Create AddGovPropFlagsToCmd and ReadGovPropFlags. (backport #14718) #15471

Merged
merged 5 commits into from
Mar 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 20, 2023

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

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

You are currently cherry-picking commit 667440221.
  (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:   x/gov/client/cli/tx.go
	modified:   x/gov/client/cli/util.go
	modified:   x/gov/client/cli/util_test.go
	modified:   x/upgrade/client/cli/parse.go
	modified:   x/upgrade/client/cli/tx.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/feegrant/client/cli/tx_test.go
	both modified:   x/upgrade/client/cli/parse_test.go

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

)

(cherry picked from commit 6674402)

# Conflicts:
#	CHANGELOG.md
#	x/feegrant/client/cli/tx_test.go
#	x/upgrade/client/cli/parse_test.go
@github-advanced-security
Copy link

You have successfully added a new gosec configuration .github/workflows/gosec.yml:Gosec. As part of the setup process, we have scanned this repository and found 229 existing alerts. Please check the repository Security tab to see all alerts.

cmd.Flags().String(cli.FlagDescription, "", "description of proposal") //nolint:staticcheck // we are intentionally using a deprecated flag here.
cmd.Flags().String(cli.FlagDeposit, "", "deposit of proposal")
cmd.MarkFlagRequired(cli.FlagTitle) //nolint:staticcheck // we are intentionally using a deprecated flag here.
cmd.MarkFlagRequired(cli.FlagTitle)

Check warning

Code scanning / gosec

Errors unhandled.

Errors unhandled.
@julienrbrt julienrbrt self-assigned this Mar 20, 2023
@julienrbrt julienrbrt removed their assignment Mar 20, 2023
@julienrbrt
Copy link
Member

I am waiting for other PR to be merged for fixing the changelog.

@julienrbrt julienrbrt enabled auto-merge (squash) March 20, 2023 15:14
@julienrbrt julienrbrt merged commit 35e4765 into release/v0.47.x Mar 20, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-14718 branch March 20, 2023 16:19
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.

2 participants