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 to v1.3.0 (backport #1511) #1516

Merged
merged 1 commit into from
Jul 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 18, 2023

This is an automatic backport of pull request #1511 done by Mergify.
Cherry-pick of 8cc747b has failed:

merge conflicts resolved by @alpe

@mergify mergify bot requested a review from alpe as a code owner July 18, 2023 13:04
@mergify mergify bot added the conflicts label Jul 18, 2023
@pinosu
Copy link
Contributor

pinosu commented Jul 18, 2023

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Jul 18, 2023

rebase

❌ Unable to rebase: user pinosu is unknown.

Please make sure pinosu has logged in Mergify dashboard.

@pinosu
Copy link
Contributor

pinosu commented Jul 18, 2023

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Jul 18, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
error: could not apply f6ed81b... Bump wasmvm to v1.3.0
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply f6ed81b... Bump wasmvm to v1.3.0

err-code: ADF3F

@alpe
Copy link
Contributor

alpe commented Jul 18, 2023

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Jul 18, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/2)
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
error: could not apply f6ed81b... Bump wasmvm to v1.3.0
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply f6ed81b... Bump wasmvm to v1.3.0

err-code: 81BC0

@alpe alpe self-assigned this Jul 18, 2023
(cherry picked from commit 8cc747b)
@alpe alpe force-pushed the mergify/bp/releases/v0.3x/pr-1511 branch from 0e5e09e to e2dd4a3 Compare July 18, 2023 15:52
@alpe alpe removed their assignment Jul 18, 2023
@codecov
Copy link

codecov bot commented Jul 18, 2023

Codecov Report

Merging #1516 (0e5e09e) into releases/v0.3x (b41fc0a) will increase coverage by 0.03%.
The diff coverage is n/a.

❗ Current head 0e5e09e differs from pull request most recent head e2dd4a3. Consider uploading reports for the commit e2dd4a3 to get more accurate results

Impacted file tree graph

@@                Coverage Diff                 @@
##           releases/v0.3x    #1516      +/-   ##
==================================================
+ Coverage           57.67%   57.71%   +0.03%     
==================================================
  Files                  57       57              
  Lines                7542     7530      -12     
==================================================
- Hits                 4350     4346       -4     
+ Misses               2881     2877       -4     
+ Partials              311      307       -4     

see 5 files with indirect coverage changes

@alpe alpe requested review from pinosu and removed request for alpe July 18, 2023 15:53
Copy link
Contributor

@pinosu pinosu left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@alpe alpe merged commit 7806aa0 into releases/v0.3x Jul 18, 2023
@alpe alpe deleted the mergify/bp/releases/v0.3x/pr-1511 branch July 18, 2023 16:09
@pinosu pinosu mentioned this pull request Aug 1, 2023
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants