-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Fix libraries outerloop pipelines #79652
Conversation
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries Issue DetailsFixes #76755
|
/azp help |
Supported commands
See additional documentation. |
/azp list |
/azp run runtime-libraries-coreclr outerloop |
Azure Pipelines successfully started running 1 pipeline(s). |
Rolling validation build: https://dev.azure.com/dnceng-public/public/_build/results?buildId=112256&view=results |
New validation rolling build: https://dev.azure.com/dnceng-public/public/_build/results?buildId=112306&view=results |
/azp run runtime-libraries-coreclr outerloop |
Azure Pipelines successfully started running 1 pipeline(s). |
/backport to release/7.0-staging (trying to fix #87287) |
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6931282173 |
@akoeplinger backporting to release/7.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix libraries outerloop pipelines
Using index info to reconstruct a base tree...
M eng/pipelines/libraries/outerloop.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/libraries/outerloop.yml
CONFLICT (content): Merge conflict in eng/pipelines/libraries/outerloop.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix libraries outerloop pipelines
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! |
@akoeplinger an error occurred while backporting to release/7.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Fixes #76755