Stop building AppHost in native AOT testing #101270
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Apr 19, 2024
eerhardt
approved these changes
Apr 19, 2024
|
/azp run runtime-nativeaot-outerloop |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/backport to release/8.0-staging |
|
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/10175899693 |
|
@ilonatommy backporting to release/8.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Stop building AppHost in native AOT testing
Using index info to reconstruct a base tree...
A eng/pipelines/coreclr/runtime-nativeaot-outerloop.yml
M eng/pipelines/runtime-sanitized.yml
M eng/pipelines/runtime.yml
M eng/testing/linker/trimmingTests.targets
Falling back to patching base and 3-way merge...
Auto-merging eng/testing/linker/trimmingTests.targets
Auto-merging eng/pipelines/runtime.yml
CONFLICT (content): Merge conflict in eng/pipelines/runtime.yml
Auto-merging eng/pipelines/runtime-sanitized.yml
CONFLICT (modify/delete): eng/pipelines/coreclr/runtime-nativeaot-outerloop.yml deleted in HEAD and modified in Stop building AppHost in native AOT testing. Version Stop building AppHost in native AOT testing of eng/pipelines/coreclr/runtime-nativeaot-outerloop.yml left in tree.
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 0001 Stop building AppHost in native AOT testing
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@ilonatommy an error occurred while backporting to release/8.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I think this was only needed because the AOT app tests were not doing the right form of publish.
Fixes #79575.
Cc @dotnet/ilc-contrib @eerhardt