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 v0.50.1 (backport #5038) #5044

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 8, 2023

This is an automatic backport of pull request #5038 done by Mergify.
Cherry-pick of 27b8afa has failed:

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

You are currently cherry-picking commit 27b8afab.
  (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)
	both modified:   CHANGELOG.md
	both modified:   e2e/go.mod
	both modified:   e2e/go.sum
	both modified:   go.mod
	both modified:   go.sum
	both modified:   modules/apps/27-interchain-accounts/host/keeper/relay_test.go
	deleted by us:   modules/apps/callbacks/go.mod
	deleted by us:   modules/apps/callbacks/go.sum
	both modified:   modules/capability/go.mod
	both modified:   modules/capability/go.sum
	both modified:   modules/capability/module.go

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

* deps: bump SDK v0.50.1

* update changelog

* deps: downgrade cosmossdk.io/core to v0.11.0

* fix interchain accounts tests

* implement app module basic correctly for capability module

* bump SDK to v0.50.1 in capability module

* downgrade cosmossdk.io/api to v0.7.2

* downgrade cosmossdk.io/api to v7.2.0 for callbacks

(cherry picked from commit 27b8afa)

# Conflicts:
#	CHANGELOG.md
#	e2e/go.mod
#	e2e/go.sum
#	go.mod
#	go.sum
#	modules/apps/27-interchain-accounts/host/keeper/relay_test.go
#	modules/apps/callbacks/go.mod
#	modules/apps/callbacks/go.sum
#	modules/capability/go.mod
#	modules/capability/go.sum
#	modules/capability/module.go
Copy link
Member

@damiannolan damiannolan left a comment

Choose a reason for hiding this comment

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

I have removed the e2e directory on this release branch and other diffs associated with strictly ibc-go and callbacks.

There is currently an unnecessary amount of workflows running on this branch with old stale code.

What do people think about reducing the number of workflows running on this branch to be capability only? All that is required is build, test, lint I suppose.

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.

Thank you @damiannolan 👑

@colin-axner
Copy link
Contributor

Would be nice if we could reference e2e's on main as a way to run e2es (future suggestion)

@DimitrisJim
Copy link
Contributor

What do people think about reducing the number of workflows running on this branch to be capability only? All that is required is build, test, lint I suppose.

ibc-go imports capability so it does make sense to run tests for it?

@damiannolan
Copy link
Member

ibc-go imports capability so it does make sense to run tests for it?

Yes, but ibc-go would still be importing a specific tag of x/capability and not these PRs. And having a local pin would just be more overhead.
All ibc-go code on this branch is effectively stale as it hasn't been maintained in-sync with this release branch.

I am confident that tagging this and importing in ibc-go would be completely fine, we could temporarily point ibc-go to the head of this branch and run tests before tagging, but the unit tests in this module were given a bit of attention such that we could rely on them as a safeguard.

Copy link
Contributor

@chatton chatton left a comment

Choose a reason for hiding this comment

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

LGTM

@damiannolan damiannolan enabled auto-merge (squash) November 8, 2023 13:03
@damiannolan damiannolan merged commit 566f633 into capability/release/v1.0.x Nov 8, 2023
6 checks passed
@damiannolan damiannolan deleted the mergify/bp/capability/release/v1.0.x/pr-5038 branch November 8, 2023 13:16
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.

5 participants