[mono] Move mono.mscordbi subset off the offical build #81917
Conversation
This isn't in use, so there's no need to build and ship it. Instead, this is being moved to the mono windows x64 leg.
|
Tagging subscribers to this area: @directhex Issue DetailsThis isn't in use, so there's no need to build and ship it. Instead, this is being moved to the mono windows x64 leg.
|
|
Should we also remove from: https://github.com/dotnet/runtime/blob/main/eng/pipelines/runtime-codeql.yml ? |
No, I think that can stay. |
ghost
locked as resolved and limited conversation to collaborators
|
/backport to release/6.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/4724948321 |
|
/backport to release/7.0 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/4724957322 |
|
@carlossanlop backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: [mono] Move mono.mscordbi subset off the offical build
Using index info to reconstruct a base tree...
A eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml
M eng/pipelines/runtime-official.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/runtime-official.yml
CONFLICT (content): Merge conflict in eng/pipelines/runtime-official.yml
CONFLICT (modify/delete): eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml deleted in HEAD and modified in [mono] Move mono.mscordbi subset off the offical build. Version [mono] Move mono.mscordbi subset off the offical build of eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 [mono] Move mono.mscordbi subset off the offical build
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! |
|
@carlossanlop an error occurred while backporting to release/6.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
Sigh... I'll reopen the closed PRs and manually remove the unwanted commits added after retargeting to the base branches. |
This isn't in use, so there's no need to build and ship it. Instead, this is being moved to the mono windows x64 public leg.