Conversation
ghost
added
the
|
@dotnet/aspnet-build okay if I force merge this since macOS has been unhappy all day and this skips a test that's broken in main |
|
|
/backport to release/6.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/aspnetcore/actions/runs/1730764317 |
|
@HaoK see #36832 (comment) for a workaround enabling you to use the backport bot. |
|
/backport to release/6.0 |
|
/backport to release/5.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/aspnetcore/actions/runs/1730885428 |
|
Started backporting to release/5.0: https://github.com/dotnet/aspnetcore/actions/runs/1730885885 |
|
@HaoK backporting to release/5.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Skip failing cert tests for now
Using index info to reconstruct a base tree...
M src/Security/Authentication/test/CertificateTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Security/Authentication/test/CertificateTests.cs
CONFLICT (content): Merge conflict in src/Security/Authentication/test/CertificateTests.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Skip failing cert tests for now
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 128Please backport manually! |
3 participants
A test client Cert expired today, skipping tests for now until cert can be regenerated
Example failing build: https://dev.azure.com/dnceng/public/_build/results?buildId=1563995&view=results