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

Use floating tag for webassembly image #109240

Merged
merged 1 commit into from
Oct 30, 2024

Conversation

mthalman
Copy link
Member

Updates the reference container image tag to be the floating tag, which will be kept current for all updates. The previously used tag is pinned to a specific version which is considered EOL at this point.

Copy link
Contributor

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

@mthalman mthalman requested a review from a team October 30, 2024 13:14
@ViktorHofer ViktorHofer merged commit 4b52682 into dotnet:main Oct 30, 2024
78 checks passed
@mthalman mthalman deleted the webassembly-tag branch October 30, 2024 15:48
@mthalman
Copy link
Member Author

/backport to release/9.0

Copy link
Contributor

Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/11596832624

@mthalman
Copy link
Member Author

/backport to release/8.0

Copy link
Contributor

Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/11596878832

Copy link
Contributor

@mthalman backporting to release/8.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Use floating tag for webassembly image
Using index info to reconstruct a base tree...
M	eng/pipelines/libraries/helix-queues-setup.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/libraries/helix-queues-setup.yml
CONFLICT (content): Merge conflict in eng/pipelines/libraries/helix-queues-setup.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Use floating tag for webassembly image
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link
Contributor

@mthalman an error occurred while backporting to release/8.0, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

@mthalman
Copy link
Member Author

Looks like 8.0 is already configured to use a floating tag so no backport needed there.

jkotas added a commit to jkotas/runtime that referenced this pull request Nov 4, 2024
jkotas added a commit to jkotas/runtime that referenced this pull request Nov 4, 2024
LightUnwind does not track sufficient context to compute GS cookie address

Fixes dotnet#109240
@github-actions github-actions bot locked and limited conversation to collaborators Nov 30, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants