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

Bump wasmvm 1.5.0 (backport #1686) #1687

Merged
merged 2 commits into from
Oct 31, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 31, 2023

This is an automatic backport of pull request #1686 done by Mergify.
Cherry-pick of a2bbd36 has failed:

On branch mergify/bp/releases/v0.4x/pr-1686
Your branch is up to date with 'origin/releases/v0.4x'.

You are currently cherry-picking commit a2bbd363.
  (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:   Dockerfile
	modified:   README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

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 a2bbd36)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested a review from alpe as a code owner October 31, 2023 11:39
@mergify mergify bot added the conflicts label Oct 31, 2023
@pinosu pinosu removed the conflicts label Oct 31, 2023
@pinosu pinosu merged commit ff574ee into releases/v0.4x Oct 31, 2023
9 checks passed
@mergify mergify bot deleted the mergify/bp/releases/v0.4x/pr-1686 branch October 31, 2023 13:10
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.

1 participant