From 34d3c82cf29c48020c28b36ea37a3160d2c037aa Mon Sep 17 00:00:00 2001 From: Yufeng Li Date: Mon, 7 Dec 2020 16:38:23 -0800 Subject: [PATCH] Fix the build break in macos release --- .../android-x86_64-crosscompile-ci-pipeline.yml | 5 ++++- .../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 ++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 2e7b403f91bbb..f7dfcfd3bfd57 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -11,7 +11,10 @@ jobs: displayName: Use Python $(pythonVersion) inputs: versionSpec: $(pythonVersion) - - script: brew install coreutils ninja + - script: + # The following line is a hack to prevent build pipeline from failing + brew uninstall openssl@1.0.2t + brew install coreutils ninja displayName: Install coreutils and ninja - script: python3 tools/ci_build/build.py --android --build_dir build --android_sdk_path $ANDROID_HOME --android_ndk_path $ANDROID_HOME/ndk-bundle --android_abi=x86_64 --android_api=29 --skip_submodule_sync --parallel --cmake_generator=Ninja --build_java displayName: CPU EP, Build and Test on Android Emulator 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 cea17393fb536..bd06933be2dd7 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 @@ -90,6 +90,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 453455188929d..c465855cb3044 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 @@ -769,6 +769,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'