diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index 9ad25d0b1a..a5478913e9 100644 --- a/.vsts-dotnet-ci.yml +++ b/.vsts-dotnet-ci.yml @@ -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: diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index f185606033..b8625090ff 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -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 python@3.12 && 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" diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 802acba24d..7a803b5a91 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -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 python@3.12 && 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 @@ -319,4 +319,4 @@ extends: -TsaIterationPath DevDiv -TsaRepositoryName machinelearning -TsaCodebaseName machinelearning - -TsaPublish $True' \ No newline at end of file + -TsaPublish $True'