aspnetcore
aspnetcore copied to clipboard
Use MacOS-13 in CI
/azp run
Azure Pipelines successfully started running 3 pipeline(s).
/backport to release/9.0
/backport to release/8.0
Started backporting to release/9.0: https://github.com/dotnet/aspnetcore/actions/runs/11443032159
Started backporting to release/8.0: https://github.com/dotnet/aspnetcore/actions/runs/11443034354
@wtgodbe 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 MacOS-13 in CI
Applying: Gradle 6.9
Applying: Update gradle-wrapper.properties
Applying: Update gradle-wrapper.properties
Applying: Update build.gradle
Applying: Update build.gradle
Applying: Update build.gradle
Applying: Update build.gradle
Applying: Update build.gradle
Applying: Update build.gradle
Applying: Update build.gradle
Applying: Fixup gradle
Using index info to reconstruct a base tree...
M global.json
M src/SignalR/clients/java/signalr/core/build.gradle
Falling back to patching base and 3-way merge...
Auto-merging src/SignalR/clients/java/signalr/core/build.gradle
Auto-merging global.json
CONFLICT (content): Merge conflict in global.json
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 0012 Fixup gradle
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@wtgodbe 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.