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

chore(deps): bump github.com/CosmWasm/wasmvm/v2 from 2.1.1 to 2.1.2 in /modules/light-clients/08-wasm (backport #7114) #7139

Merged
merged 4 commits into from
Aug 21, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 13, 2024

Bumps github.com/CosmWasm/wasmvm/v2 from 2.1.1 to 2.1.2.

Release notes

Sourced from github.com/CosmWasm/wasmvm/v2's releases.

v2.1.2

Build artifacts generated at this tag.

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

This is an automatic backport of pull request #7114 done by [Mergify](https://mergify.com).

…n /modules/light-clients/08-wasm (#7114)

* chore(deps): bump github.com/CosmWasm/wasmvm/v2

Bumps [github.com/CosmWasm/wasmvm/v2](https://github.com/CosmWasm/wasmvm) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/CosmWasm/wasmvm/releases)
- [Changelog](https://github.com/CosmWasm/wasmvm/blob/main/CHANGELOG.md)
- [Commits](CosmWasm/wasmvm@v2.1.1...v2.1.2)

---
updated-dependencies:
- dependency-name: github.com/CosmWasm/wasmvm/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* e2e: go mod tidy

* add changelog

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
(cherry picked from commit 10c2436)

# Conflicts:
#	e2e/go.mod
#	e2e/go.sum
#	modules/light-clients/08-wasm/CHANGELOG.md
#	modules/light-clients/08-wasm/go.mod
#	modules/light-clients/08-wasm/go.sum
Copy link
Contributor Author

mergify bot commented Aug 13, 2024

Cherry-pick of 10c2436 has failed:

On branch mergify/bp/release/v9.0.x/pr-7114
Your branch is up to date with 'origin/release/v9.0.x'.

You are currently cherry-picking commit 10c24362.
  (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:   modules/light-clients/08-wasm/CHANGELOG.md
	both modified:   modules/light-clients/08-wasm/go.mod
	both modified:   modules/light-clients/08-wasm/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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

e2e/go.mod Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

we can remove this file?

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.

Should we be branching 08-wasm v9 release branch off main instead?

@crodriguezvega
Copy link
Contributor

Should we be branching 08-wasm v9 release branch off main instead?

I might be wrong, but I thought we branched before from the ibc-go release branches... Also, wouldn't it be safe to branch from the release branch to make sure that no other API breaking changes silently slip through? Maybe it's also easier to sync the 08-wasm branch with the release branch?

@damiannolan
Copy link
Member

isn't this the ibc-go release branch for v9? do we need 08-wasm on this at all, I'm not sure if it exists on the v8.x branches, does it?

@crodriguezvega
Copy link
Contributor

isn't this the ibc-go release branch for v9? do we need 08-wasm on this at all, I'm not sure if it exists on the v8.x branches, does it?

You're right, @damiannolan! Should we for this time create the wasm branch from release/v9.0.x (since it already has some staff back ported for 08-wasm) and afterwards we delete the module from release/v9.0.x. I could check the commits on main since we created release/v9.0.x and make sure that if there's nothing else API breaking, then branch from main. I think I would prefer the former since it is a bit less work, though...

Note for self: I should document this process in Notion or the repository.

@crodriguezvega
Copy link
Contributor

This is just updating the changelog now, since the wasmvm bump already has been merged in 4ccf122#diff-04f3aa44f198c9cf2e90c73f8e4cfdf3237e9a62f50e461cef2526e11193ccee.

@crodriguezvega crodriguezvega merged commit 85a78ad into release/v9.0.x Aug 21, 2024
23 checks passed
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v9.0.x/pr-7114 branch August 21, 2024 12:11
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