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

deps: bump sdk to v0.47.2 and cometbft to v0.37.1 (backport #3542) #3544

Merged
merged 4 commits into from
May 3, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 3, 2023

This is an automatic backport of pull request #3542 done by Mergify.
Cherry-pick of 48341b4 has failed:

On branch mergify/bp/release/v7.1.x/pr-3542
Your branch is up to date with 'origin/release/v7.1.x'.

You are currently cherry-picking commit 48341b40.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   e2e/go.mod
	deleted by us:   e2e/go.sum
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   modules/capability/go.mod
	deleted by us:   modules/capability/go.sum

no changes added to commit (use "git add" and/or "git commit -a")

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 48341b4)

# Conflicts:
#	e2e/go.mod
#	e2e/go.sum
#	go.mod
#	go.sum
#	modules/capability/go.mod
#	modules/capability/go.sum
@damiannolan damiannolan removed their assignment May 3, 2023
@damiannolan
Copy link
Member

damiannolan commented May 3, 2023

hold up, build is failing

fyi: #3545

@colin-axner colin-axner merged commit 237f5b2 into release/v7.1.x May 3, 2023
@colin-axner colin-axner deleted the mergify/bp/release/v7.1.x/pr-3542 branch May 3, 2023 11:24
@faddat faddat mentioned this pull request Jun 23, 2023
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants