Fix Java discovery in helix-matrix pipeline #54631
Merged
+1
−1
Conversation
This file contains hidden or 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
ghost
added
the
area-infrastructure
wtgodbe
approved these changes
Mar 19, 2024
mmitche
approved these changes
Mar 19, 2024
|
Failures are unrelated. |
|
@halter73 is this good to go? I can merge on red |
|
@wtgodbe Thanks. Go ahead. The helix-matrix run got further than before at least. |
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/aspnetcore/actions/runs/12039553011 |
|
@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: Fix Java discovery in helix-matrix pipeline
Using index info to reconstruct a base tree...
M .azure/pipelines/helix-matrix.yml
Falling back to patching base and 3-way merge...
Auto-merging .azure/pipelines/helix-matrix.yml
CONFLICT (content): Merge conflict in .azure/pipelines/helix-matrix.yml
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 Fix Java discovery in helix-matrix pipeline
Error: The process '/usr/bin/git' failed with exit code 128Please 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. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
After #54421 got merged, the "Build shared fx" step of our helix-matrix pipeline started failing with errors finding the JDK.
I saw that #54421 added an
NativeToolsOnMachineparam to build.ps1 which it uses in ci.yml, so I did the same in helix-matrix.yml. Hopefully next we can make the pipeline green.Test helix-matrix run: https://dev.azure.com/dnceng-public/public/_build/results?buildId=609177&view=results