Install native dependencies on all Apple OS in CI #82263
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
|
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. |
ghost
added
the
community-contribution
am11
force-pushed
the
feature/ci/native-deps
branch
from
efb18c2
to
b8cfd0c
Compare
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure Issue DetailsFix #82240
|
am11
force-pushed
the
feature/ci/native-deps
branch
4 times, most recently
from
ce74afc
to
6e66d02
Compare
am11
force-pushed
the
feature/ci/native-deps
branch
4 times, most recently
from
b1db4f0
to
d516a0b
Compare
am11
force-pushed
the
feature/ci/native-deps
branch
from
d516a0b
to
21d19cb
Compare
hoyosjs
reviewed
Feb 17, 2023
hoyosjs
approved these changes
Feb 17, 2023
|
Quic test failure is unrelated. Lets merge this to unblock various pipelines. |
4 tasks
akoeplinger
approved these changes
Feb 17, 2023
|
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 128Please 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 128Please 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. |
This was referenced Feb 17, 2023
ghost
locked as resolved and limited conversation to collaborators
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.
Fix #82240
(hopefully 🤞)