-
Notifications
You must be signed in to change notification settings - Fork 4.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Install native dependencies on all Apple OS in CI #82263
Conversation
I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label. |
efb18c2
to
b8cfd0c
Compare
Tagging subscribers to this area: @dotnet/runtime-infrastructure Issue DetailsFix #82240
|
ce74afc
to
6e66d02
Compare
b1db4f0
to
d516a0b
Compare
d516a0b
to
21d19cb
Compare
Quic test failure is unrelated. Lets merge this to unblock various pipelines. |
Thank you! |
/backport to release/6.0 |
/backport to release/7.0 |
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/4207364880 |
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/4207366024 |
@hoyosjs backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Install native dependencies on all Apple OS in CI
Using index info to reconstruct a base tree...
M eng/install-native-dependencies.sh
M eng/pipelines/common/global-build-job.yml
M eng/pipelines/common/templates/runtimes/build-test-job.yml
M eng/pipelines/coreclr/templates/build-jit-job.yml
M eng/pipelines/coreclr/templates/build-job.yml
A eng/pipelines/installer/jobs/build-job.yml
M eng/pipelines/libraries/build-job.yml
M eng/pipelines/libraries/run-test-job.yml
M eng/pipelines/mono/templates/build-job.yml
M eng/pipelines/mono/templates/generate-offsets.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/mono/templates/generate-offsets.yml
CONFLICT (content): Merge conflict in eng/pipelines/mono/templates/generate-offsets.yml
Auto-merging eng/pipelines/mono/templates/build-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/mono/templates/build-job.yml
Auto-merging eng/pipelines/libraries/run-test-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/libraries/run-test-job.yml
Auto-merging eng/pipelines/libraries/build-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/libraries/build-job.yml
CONFLICT (modify/delete): eng/pipelines/installer/jobs/build-job.yml deleted in HEAD and modified in Install native dependencies on all Apple OS in CI. Version Install native dependencies on all Apple OS in CI of eng/pipelines/installer/jobs/build-job.yml left in tree.
Auto-merging eng/pipelines/coreclr/templates/build-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/coreclr/templates/build-job.yml
Auto-merging eng/pipelines/coreclr/templates/build-jit-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/coreclr/templates/build-jit-job.yml
Auto-merging eng/pipelines/common/templates/runtimes/build-test-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/common/templates/runtimes/build-test-job.yml
Auto-merging eng/pipelines/common/global-build-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/common/global-build-job.yml
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 Install native dependencies on all Apple OS 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 128 Please backport manually! |
@hoyosjs 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. |
@hoyosjs backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Install native dependencies on all Apple OS in CI
Using index info to reconstruct a base tree...
M eng/install-native-dependencies.sh
M eng/pipelines/common/global-build-job.yml
M eng/pipelines/common/templates/runtimes/build-test-job.yml
M eng/pipelines/coreclr/templates/build-jit-job.yml
M eng/pipelines/coreclr/templates/build-job.yml
A eng/pipelines/installer/jobs/build-job.yml
M eng/pipelines/libraries/build-job.yml
M eng/pipelines/libraries/run-test-job.yml
M eng/pipelines/mono/templates/build-job.yml
M eng/pipelines/mono/templates/generate-offsets.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/mono/templates/generate-offsets.yml
CONFLICT (content): Merge conflict in eng/pipelines/mono/templates/generate-offsets.yml
Auto-merging eng/pipelines/mono/templates/build-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/mono/templates/build-job.yml
Auto-merging eng/pipelines/libraries/run-test-job.yml
Auto-merging eng/pipelines/libraries/build-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/libraries/build-job.yml
CONFLICT (modify/delete): eng/pipelines/installer/jobs/build-job.yml deleted in HEAD and modified in Install native dependencies on all Apple OS in CI. Version Install native dependencies on all Apple OS in CI of eng/pipelines/installer/jobs/build-job.yml left in tree.
Auto-merging eng/pipelines/coreclr/templates/build-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/coreclr/templates/build-job.yml
Auto-merging eng/pipelines/coreclr/templates/build-jit-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/coreclr/templates/build-jit-job.yml
Auto-merging eng/pipelines/common/templates/runtimes/build-test-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/common/templates/runtimes/build-test-job.yml
Auto-merging eng/pipelines/common/global-build-job.yml
CONFLICT (content): Merge conflict in eng/pipelines/common/global-build-job.yml
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 Install native dependencies on all Apple OS 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 128 Please backport manually! |
@hoyosjs 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. |
Fix #82240
(hopefully 🤞)