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 math to rc (backport #17866) #17872

Merged
merged 2 commits into from
Sep 25, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 25, 2023

This is an automatic backport of pull request #17866 done by Mergify.
Cherry-pick of 31db604 has failed:

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

You are currently cherry-picking commit 31db604d6.
  (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:   client/v2/go.mod
	modified:   client/v2/go.sum
	modified:   core/go.mod
	modified:   core/go.sum
	modified:   go.mod
	modified:   go.sum
	modified:   simapp/go.mod
	modified:   simapp/go.sum
	modified:   store/go.mod
	modified:   store/go.sum
	modified:   tests/go.sum
	modified:   x/circuit/go.mod
	modified:   x/circuit/go.sum
	modified:   x/evidence/go.mod
	modified:   x/evidence/go.sum
	modified:   x/feegrant/go.mod
	modified:   x/feegrant/go.sum
	modified:   x/nft/go.mod
	modified:   x/nft/go.sum
	modified:   x/upgrade/go.mod
	modified:   x/upgrade/go.sum

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   simapp/gomod2nix.toml
	both modified:   tests/go.mod
	deleted by us:   tests/starship/tests/go.mod
	deleted by us:   tests/starship/tests/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
	both modified:   x/tx/go.mod
	both modified:   x/tx/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

@mergify mergify bot requested a review from a team as a code owner September 25, 2023 15:29
@mergify mergify bot added the conflicts label Sep 25, 2023
@github-prbot github-prbot requested review from a team, kocubinski and samricotta and removed request for a team September 25, 2023 15:30
@julienrbrt julienrbrt force-pushed the mergify/bp/release/v0.50.x/pr-17866 branch from e963615 to 925d8e4 Compare September 25, 2023 16:40
@julienrbrt julienrbrt enabled auto-merge (squash) September 25, 2023 16:51
@julienrbrt julienrbrt merged commit 467d2f7 into release/v0.50.x Sep 25, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17866 branch September 25, 2023 17:06
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant