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

update sdk in capabilities (backport #4399) #4440

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 23, 2023

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

On branch mergify/bp/capability/release/v1.0.x/pr-4399
Your branch is up to date with 'origin/capability/release/v1.0.x'.

You are currently cherry-picking commit 7c5bd1eb.
  (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 <file>..." to mark resolution)
	both modified:   modules/capability/go.mod
	both modified:   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

…ity (#4399)

* update all modules to go 1.2.1

* update golang in the Dockerfile

* update cosmos-sdk in capability module

---------

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
(cherry picked from commit 7c5bd1e)

# Conflicts:
#	modules/capability/go.mod
#	modules/capability/go.sum
Copy link
Contributor

@colin-axner colin-axner left a comment

Choose a reason for hiding this comment

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

ACK, thanks @damiannolan!

go 1.20
go 1.21

toolchain go1.21.0
Copy link
Contributor

Choose a reason for hiding this comment

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

oddly never seen this, it showed after go mod tidy to generate a new go.sum - removing manually and go mod tidy again and it doesn't show up

@damiannolan damiannolan merged commit 6cbae86 into capability/release/v1.0.x Aug 23, 2023
@damiannolan damiannolan deleted the mergify/bp/capability/release/v1.0.x/pr-4399 branch August 23, 2023 15:19
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.

3 participants