Don't upgrade homebrew packages in CI #80443
Conversation
Should fix #80428
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure Issue DetailsShould fix #80428
|
|
Merging without waiting for full CI to unblock the builds, the relevant step is green with this fix. |
|
/backport to release/7.0 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/3886336575 |
|
/backport to release/6.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/3886342353 |
|
@ViktorHofer backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Don't upgrade homebrew packages in CI
Using index info to reconstruct a base tree...
M eng/install-native-dependencies.sh
Falling back to patching base and 3-way merge...
Auto-merging eng/install-native-dependencies.sh
CONFLICT (content): Merge conflict in eng/install-native-dependencies.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Don't upgrade homebrew packages in CI
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! |
|
@ViktorHofer an error occurred while backporting to release/7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
@ViktorHofer backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Don't upgrade homebrew packages in CI
Using index info to reconstruct a base tree...
M eng/install-native-dependencies.sh
Falling back to patching base and 3-way merge...
Auto-merging eng/install-native-dependencies.sh
CONFLICT (content): Merge conflict in eng/install-native-dependencies.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Don't upgrade homebrew packages in CI
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! |
|
@ViktorHofer 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. |
ghost
locked as resolved and limited conversation to collaborators
Fixes #80428, originally caused by actions/setup-python#577 and actions/runner-images#6868