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

Consistent argument order in entrypoint wrappers. (backport #5134) #5247

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 29, 2023

This is an automatic backport of pull request #5134 done by Mergify.
Cherry-pick of 482b6b2 has failed:

On branch mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.4.x/pr-5134
Your branch is up to date with 'origin/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.4.x'.

You are currently cherry-picking commit 482b6b26.
  (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:   modules/light-clients/08-wasm/types/client_state.go
	modified:   modules/light-clients/08-wasm/types/proposal_handle.go
	modified:   modules/light-clients/08-wasm/types/update.go
	modified:   modules/light-clients/08-wasm/types/upgrade.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/light-clients/08-wasm/types/export_test.go
	both modified:   modules/light-clients/08-wasm/types/vm.go

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 482b6b2)

# Conflicts:
#	modules/light-clients/08-wasm/types/export_test.go
#	modules/light-clients/08-wasm/types/vm.go
@DimitrisJim DimitrisJim added priority PRs that need prompt reviews and removed conflicts labels Nov 29, 2023
@DimitrisJim DimitrisJim removed their assignment Nov 29, 2023
Copy link
Contributor

@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.

Legendary 🚀

…o mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.4.x/pr-5134
@DimitrisJim DimitrisJim merged commit 55f3b8f into 08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.4.x Nov 29, 2023
17 checks passed
@DimitrisJim DimitrisJim deleted the mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.4.x/pr-5134 branch November 29, 2023 17:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority PRs that need prompt reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants