Skip to content

Conversation

@wfurt
Copy link
Member

@wfurt wfurt commented May 15, 2023

No description provided.

@wfurt wfurt requested review from carlossanlop and rbhanda May 15, 2023 20:05
@wfurt wfurt self-assigned this May 15, 2023
@ghost
Copy link

ghost commented May 15, 2023

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

Issue Details

null

Author: wfurt
Assignees: wfurt
Labels:

area-Infrastructure-libraries

Milestone: -

@wfurt
Copy link
Member Author

wfurt commented May 15, 2023

/backport to release/7.0-staging

@wfurt
Copy link
Member Author

wfurt commented May 15, 2023

/backport to release/6.0-staging

@wfurt
Copy link
Member Author

wfurt commented May 15, 2023

/backport to release/7.0-staging

@github-actions
Copy link
Contributor

Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/4984960935

@wfurt
Copy link
Member Author

wfurt commented May 15, 2023

/backport to release/6.0-staging

@github-actions
Copy link
Contributor

Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/4984996637

@github-actions
Copy link
Contributor

@wfurt backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:

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

Applying: add RID for Alpine 3.18
Using index info to reconstruct a base tree...
M	src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
M	src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
M	src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
CONFLICT (content): Merge conflict in src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
Auto-merging src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
Auto-merging src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add RID for Alpine 3.18
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions
Copy link
Contributor

@wfurt an error occurred while backporting to release/6.0-staging, please check the run log for details!

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

@wfurt wfurt merged commit 6e1e216 into dotnet:main May 15, 2023
@ghost ghost locked as resolved and limited conversation to collaborators Jun 15, 2023
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