From c38f76282190e10dd75ea2bedd35f1e73585abbf Mon Sep 17 00:00:00 2001 From: Yufeng Li Date: Mon, 7 Dec 2020 20:39:36 -0800 Subject: [PATCH] work around of the build break in mac (#6069) * Fix the build break in macos release * revert android change --- .../github/azure-pipelines/c-api-packaging-pipelines.yml | 2 ++ .../github/azure-pipelines/nuget/templates/test_macos.yml | 2 ++ tools/ci_build/github/azure-pipelines/templates/mac-ci.yml | 2 ++ .../github/azure-pipelines/templates/py-packaging-stage.yml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml b/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml index 0037d33c9c536..4c459c249d7b7 100644 --- a/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml +++ b/tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml @@ -102,6 +102,8 @@ jobs: 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 + # The following line is a hack to prevent build pipeline from failing + brew uninstall openssl@1.0.2t brew install libomp python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --use_openmp --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --parallel --build_shared_lib --config Release displayName: 'Build and Test MacOS' diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml index b3254e3c62f1d..99be6c2e4d5a9 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml @@ -35,6 +35,8 @@ jobs: packageFolder: '$(Build.BinariesDirectory)/nuget-artifact' - script: | + # The following line is a hack to prevent build pipeline from failing + brew uninstall openssl@1.0.2t brew install libomp $(Build.SourcesDirectory)/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest.sh \ $(Build.BinariesDirectory)/nuget-artifact \ diff --git a/tools/ci_build/github/azure-pipelines/templates/mac-ci.yml b/tools/ci_build/github/azure-pipelines/templates/mac-ci.yml index 5d722da93aa70..ed424ca59ef77 100644 --- a/tools/ci_build/github/azure-pipelines/templates/mac-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/mac-ci.yml @@ -39,6 +39,8 @@ jobs: 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 + # The following line is a hack to prevent build pipeline from failing + brew uninstall openssl@1.0.2t brew install libomp ${{ parameters.BuildCommand }} displayName: 'Build and Test OnnxRuntime lib for MacOS' diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml index 1d61052f2b702..c5008d5bdb3f4 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml @@ -788,6 +788,8 @@ stages: 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 + # The following line is a hack to prevent build pipeline from failing + brew uninstall openssl@1.0.2t brew install libomp python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --use_openmp --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --parallel --config Release --skip_onnx_tests --build_wheel ${{ parameters.build_py_parameters }} displayName: 'Command Line Script'