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/cockroachdb/errors from 1.9.1 to 1.10.0 (backport #16516) #16518

Merged
merged 2 commits into from
Jun 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 13, 2023

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

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

You are currently cherry-picking commit eba06fd86.
  (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:   collections/go.mod
	modified:   core/go.mod
	modified:   core/go.sum
	modified:   depinject/go.mod
	modified:   go.mod
	modified:   go.sum
	modified:   orm/go.mod
	modified:   simapp/go.mod
	modified:   simapp/go.sum
	modified:   store/go.mod
	modified:   store/go.sum
	modified:   tests/go.mod
	modified:   tests/go.sum
	modified:   tools/confix/go.mod
	modified:   tools/confix/go.sum
	modified:   tools/cosmovisor/go.mod
	modified:   tools/cosmovisor/go.sum
	modified:   tools/hubl/go.sum
	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/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 <file>..." to mark resolution)
	both modified:   collections/go.sum
	both modified:   depinject/go.sum
	both modified:   orm/go.sum
	both modified:   tools/hubl/go.mod

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

…16516)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
(cherry picked from commit eba06fd)

# Conflicts:
#	collections/go.sum
#	depinject/go.sum
#	orm/go.sum
#	tools/hubl/go.mod
@mergify mergify bot requested a review from a team as a code owner June 13, 2023 08:18
@mergify mergify bot added the conflicts label Jun 13, 2023
@github-actions github-actions bot added C:CLI C:collections C:Confix Issues and PR related to Confix C:Cosmovisor Issues and PR related to Cosmovisor C:Hubl Tool: Hubl C:orm C:Rosetta Issues and PR related to Rosetta C:Store C:x/circuit C:x/evidence C:x/feegrant C:x/nft C:x/upgrade labels Jun 13, 2023
@julienrbrt julienrbrt self-assigned this Jun 13, 2023
@julienrbrt julienrbrt removed their assignment Jun 13, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) June 13, 2023 12:25
@julienrbrt julienrbrt merged commit 26d2907 into release/v0.50.x Jun 13, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16516 branch June 13, 2023 12:37
@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:collections C:Confix Issues and PR related to Confix C:Cosmovisor Issues and PR related to Cosmovisor C:Hubl Tool: Hubl C:orm C:Rosetta Issues and PR related to Rosetta C:Store 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