Skip to content

Commit 59973fc

Browse files
testing arm python brew overwite (#7058)
* testing arm python brew overwite * more m1 testing * Install python@3.12 before libomp * Update official build libomp install command --------- Co-authored-by: Eric StJohn <ericstj@microsoft.com>
1 parent f6ddd9b commit 59973fc

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.vsts-dotnet-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
innerLoop: true
128128
pool:
129129
vmImage: macOS-12
130-
helixQueue: OSX.1100.Arm64.Open
130+
helixQueue: OSX.1200.Arm64.Open
131131

132132
- template: /build/ci/job-template.yml
133133
parameters:

build/ci/job-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
displayName: Install MacOS build dependencies
7272
# Extra Apple MacOS step required to install OS-specific dependencies
7373
- ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}:
74-
- script: brew update && brew install libomp && brew link libomp --force
74+
- script: brew update && brew install -f --overwrite python@3.12 && brew install libomp && brew link libomp --force
7575
displayName: Install MacOS ARM build dependencies
7676
- ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.vmImage, 'ubuntu-18.04')) }}:
7777
- bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH"

build/vsts-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ extends:
153153
rm -rf /usr/local/bin/2to3
154154
displayName: MacOS Homebrew bug Workaround
155155
continueOnError: true
156-
- script: brew update && brew install libomp && brew link libomp --force
156+
- script: brew update && brew install -f --overwrite python@3.12 && brew install libomp && brew link libomp --force
157157
displayName: Install build dependencies
158158
# Only build native assets to avoid conflicts.
159159
- script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=arm64 /p:CopyPackageAssets=true
@@ -319,4 +319,4 @@ extends:
319319
-TsaIterationPath DevDiv
320320
-TsaRepositoryName machinelearning
321321
-TsaCodebaseName machinelearning
322-
-TsaPublish $True'
322+
-TsaPublish $True'

0 commit comments

Comments
 (0)