Skip to content

testing arm python brew overwite #7058

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Mar 12, 2024
Merged

testing arm python brew overwite #7058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b44b6a6
testing arm python brew overwite
michaelgsharp Mar 11, 2024
aecd79f
more m1 testing
michaelgsharp Mar 12, 2024
5e4dfb6
Install [email protected] before libomp
ericstj Mar 12, 2024
fa9b041
Update official build libomp install command
ericstj Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vsts-dotnet-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:
innerLoop: true
pool:
vmImage: macOS-12
helixQueue: OSX.1100.Arm64.Open
helixQueue: OSX.1200.Arm64.Open

- template: /build/ci/job-template.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion build/ci/job-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
displayName: Install MacOS build dependencies
# Extra Apple MacOS step required to install OS-specific dependencies
- ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}:
- script: brew update && brew install libomp && brew link libomp --force
- script: brew update && brew install -f --overwrite [email protected] && brew install libomp && brew link libomp --force
displayName: Install MacOS ARM build dependencies
- ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.vmImage, 'ubuntu-18.04')) }}:
- bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH"
Expand Down
4 changes: 2 additions & 2 deletions build/vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ extends:
rm -rf /usr/local/bin/2to3
displayName: MacOS Homebrew bug Workaround
continueOnError: true
- script: brew update && brew install libomp && brew link libomp --force
- script: brew update && brew install -f --overwrite [email protected] && brew install libomp && brew link libomp --force
displayName: Install build dependencies
# Only build native assets to avoid conflicts.
- script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=arm64 /p:CopyPackageAssets=true
Expand Down Expand Up @@ -319,4 +319,4 @@ extends:
-TsaIterationPath DevDiv
-TsaRepositoryName machinelearning
-TsaCodebaseName machinelearning
-TsaPublish $True'
-TsaPublish $True'