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

Add env variable to cmd flags (backport #9040) #9318

Merged
merged 4 commits into from
May 17, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 12, 2021

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

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

You are currently cherry-picking commit a465ae182.
  (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:
	new file:   client/config/config_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   client/context.go
	both modified:   simapp/simd/cmd/root.go

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/

* first draft

* add tests in config_test package

* refactored, all tests pass, r4r

* ready for review

* add envPrefix

* Update simapp/simd/cmd/root.go

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>

* fix linter issues

* minor fixes

Co-authored-by: Alessio Treglia <alessio@tendermint.com>
Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit a465ae1)

# Conflicts:
#	client/context.go
#	simapp/simd/cmd/root.go
@mergify mergify bot added the conflicts label May 12, 2021
@mergify mergify bot mentioned this pull request May 12, 2021
9 tasks
@amaury1093 amaury1093 marked this pull request as draft May 12, 2021 11:52
@amaury1093 amaury1093 added this to the v0.42.5 milestone May 12, 2021
@robert-zaremba robert-zaremba marked this pull request as ready for review May 14, 2021 12:11
@robert-zaremba robert-zaremba marked this pull request as draft May 14, 2021 12:12
@amaury1093 amaury1093 marked this pull request as ready for review May 17, 2021 15:40
@robert-zaremba robert-zaremba added the A:automerge Automatically merge PR once all prerequisites pass. label May 17, 2021
@aaronc aaronc merged commit 5531aaf into release/v0.42.x May 17, 2021
@aaronc aaronc deleted the mergify/bp/release/v0.42.x/pr-9040 branch May 17, 2021 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge Automatically merge PR once all prerequisites pass.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants