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

chore: clean-up all replaces and add tagging process (backport #16528) #16539

Merged
merged 3 commits into from
Jun 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 14, 2023

This is an automatic backport of pull request #16528 done by Mergify.
Cherry-pick of 7a55c93 has failed:

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

You are currently cherry-picking commit 7a55c936a.
  (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:   RELEASE_PROCESS.md
	modified:   client/v2/go.mod
	modified:   client/v2/go.sum
	modified:   go.mod
	modified:   simapp/go.mod
	modified:   tests/go.mod
	modified:   tools/confix/go.mod
	modified:   tools/rosetta/go.mod
	modified:   tools/rosetta/go.sum
	modified:   x/circuit/go.mod
	modified:   x/circuit/go.sum
	modified:   x/evidence/go.mod
	modified:   x/feegrant/go.mod
	modified:   x/feegrant/go.sum
	modified:   x/nft/go.mod
	modified:   x/upgrade/go.mod

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.sum
	both modified:   simapp/go.sum
	both modified:   tests/go.sum
	both modified:   tools/confix/go.sum
	both modified:   tools/cosmovisor/go.mod
	both modified:   tools/cosmovisor/go.sum
	both modified:   x/evidence/go.sum
	both modified:   x/nft/go.sum
	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/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 7a55c93)

# Conflicts:
#	go.sum
#	simapp/go.sum
#	tests/go.sum
#	tools/confix/go.sum
#	tools/cosmovisor/go.mod
#	tools/cosmovisor/go.sum
#	x/evidence/go.sum
#	x/nft/go.sum
#	x/upgrade/go.sum
@mergify mergify bot requested a review from a team as a code owner June 14, 2023 11:25
@mergify mergify bot added the conflicts label Jun 14, 2023
@github-actions github-actions bot added C:CLI C:Confix Issues and PR related to Confix C:Cosmovisor Issues and PR related to Cosmovisor C:Rosetta Issues and PR related to Rosetta C:x/circuit C:x/evidence C:x/feegrant C:x/nft C:x/upgrade labels Jun 14, 2023
@julienrbrt julienrbrt self-assigned this Jun 14, 2023
x/circuit/go.mod Outdated
@@ -12,7 +12,7 @@ require (
cosmossdk.io/store v0.1.0-alpha.1.0.20230606190835-3e18f4088b2c
github.com/cockroachdb/errors v1.10.0
github.com/cometbft/cometbft v0.38.0-rc1
github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230524212735-6cabb6aa5741
github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230614103911-b3da8bb4e801
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All modules should use v0.50-alpha

@julienrbrt julienrbrt enabled auto-merge (squash) June 14, 2023 11:51
@julienrbrt julienrbrt merged commit 5c3139b into release/v0.50.x Jun 14, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16528 branch June 14, 2023 12:31
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:CLI C:Confix Issues and PR related to Confix C:Cosmovisor Issues and PR related to Cosmovisor C:Rosetta Issues and PR related to Rosetta C:x/circuit C:x/evidence C:x/feegrant C:x/nft C:x/upgrade
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant