Update Mac CI builds to use macOS-10.15 image, Xcode 12.4. (#7437)

Update Mac CI builds to use macOS-10.15 image, Xcode 12.4.
This commit is contained in:
Edward Chen 2021-05-27 09:39:34 -07:00 committed by GitHub
parent 2a3851cd75
commit 45a7352622
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 13 deletions

View file

@ -195,4 +195,4 @@ TEST_F(FunExpansionTest, GeluGrad_HalfPrecision) {
}
} // namespace test
} // namespace onnxruntime
} // namespace onnxruntime

View file

@ -1,7 +1,7 @@
jobs:
- job: Android_CI
pool:
vmImage: 'macOS-10.14'
vmImage: 'macOS-10.15'
timeoutInMinutes: 150
steps:
# Onnx has no 3.9 python package available yet, need to use python 3.8 to avoid build onnx package

View file

@ -6,7 +6,7 @@ jobs:
workspace:
clean: all
pool:
vmImage: 'macOS-10.14'
vmImage: 'macOS-10.15'
dependsOn:
- NuGet_Packaging
condition: succeeded()

View file

@ -99,7 +99,7 @@ jobs:
workspace:
clean: all
pool:
vmImage: 'macOS-10.14'
vmImage: 'macOS-10.15'
timeoutInMinutes: 120
steps:
- template: set-version-number-variables-step.yml
@ -116,7 +116,7 @@ jobs:
export ONNX_ML=1
export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=OFF -DONNX_WERROR=OFF"
sudo python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
sudo xcode-select --switch /Applications/Xcode_10.app/Contents/Developer
sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer
brew install libomp
python3 $(Build.SourcesDirectory)/tools/ci_build/build.py ${{ parameters.AdditionalBuildFlags }} --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --parallel --build_shared_lib --config Release
displayName: 'Build and Test MacOS'

View file

@ -109,7 +109,7 @@ jobs:
workspace:
clean: all
pool:
vmImage: 'macOS-10.14'
vmImage: 'macOS-10.15'
timeoutInMinutes: 120
steps:
- template: set-version-number-variables-step.yml
@ -126,7 +126,7 @@ jobs:
export ONNX_ML=1
export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=OFF -DONNX_WERROR=OFF"
sudo python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
sudo xcode-select --switch /Applications/Xcode_10.app/Contents/Developer
sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer
brew install libomp
python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --build_java ${{ parameters.AdditionalBuildFlags }} --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --parallel --build_shared_lib --config Release
displayName: 'Build and Test MacOS'
@ -669,7 +669,7 @@ jobs:
workspace:
clean: all
pool:
vmImage: 'macOS-10.14'
vmImage: 'macOS-10.15'
variables:
- name: runCodesignValidationInjection
value: false
@ -697,7 +697,7 @@ jobs:
popd
wget https://oss.sonatype.org/service/local/repositories/releases/content/org/junit/platform/junit-platform-console-standalone/1.6.2/junit-platform-console-standalone-1.6.2.jar -P ./
wget https://oss.sonatype.org/service/local/repositories/google-releases/content/com/google/protobuf/protobuf-java/3.9.2/protobuf-java-3.9.2.jar -P ./
sudo xcode-select --switch /Applications/Xcode_10.app/Contents/Developer
sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer
brew install libomp
DYLD_LIBRARY_PATH=./test:${DYLD_LIBRARY_PATH}
java -jar ./junit-platform-console-standalone-1.6.2.jar -cp .:./test:./protobuf-java-3.9.2.jar:./onnxruntime-$(OnnxRuntimeVersion).jar --scan-class-path --fail-if-no-tests --disable-banner

View file

@ -15,7 +15,7 @@ jobs:
clean: all
timeoutInMinutes: 120
pool:
vmImage: 'macOS-10.14'
vmImage: 'macOS-10.15'
variables:
BuildCommand: ${{ parameters.BuildCommand }}
ALLOW_RELEASED_ONNX_OPSET_ONLY: ${{ parameters.AllowReleasedOpsetOnly }}
@ -45,7 +45,7 @@ jobs:
export ONNX_ML=1
export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=OFF -DONNX_WERROR=OFF"
sudo python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
sudo xcode-select --switch /Applications/Xcode_10.app/Contents/Developer
sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer
${{ parameters.BuildCommand }}
displayName: 'Build and Test OnnxRuntime lib for MacOS'
- task: PublishTestResults@2

View file

@ -1160,7 +1160,7 @@ stages:
workspace:
clean: all
pool:
vmImage: 'macOS-10.14'
vmImage: 'macOS-10.15'
strategy:
matrix:
Python36:
@ -1193,7 +1193,7 @@ stages:
export ONNX_ML=1
export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=OFF -DONNX_WERROR=OFF"
sudo python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
sudo xcode-select --switch /Applications/Xcode_10.app/Contents/Developer
sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer
python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --parallel --config Release --skip_onnx_tests --build_wheel ${{ parameters.build_py_parameters }}
displayName: 'Command Line Script'