Skip to content

Commit c38f762

Browse files
yufengleesnnn
authored andcommitted
work around of the build break in mac (#6069)
* Fix the build break in macos release * revert android change
1 parent d19ad2c commit c38f762

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

tools/ci_build/github/azure-pipelines/c-api-packaging-pipelines.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ jobs:
102102
export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=OFF -DONNX_WERROR=OFF"
103103
sudo python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
104104
sudo xcode-select --switch /Applications/Xcode_10.app/Contents/Developer
105+
# The following line is a hack to prevent build pipeline from failing
106+
brew uninstall [email protected]
105107
brew install libomp
106108
python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --use_openmp --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --parallel --build_shared_lib --config Release
107109
displayName: 'Build and Test MacOS'

tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ jobs:
3535
packageFolder: '$(Build.BinariesDirectory)/nuget-artifact'
3636

3737
- script: |
38+
# The following line is a hack to prevent build pipeline from failing
39+
brew uninstall [email protected]
3840
brew install libomp
3941
$(Build.SourcesDirectory)/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest.sh \
4042
$(Build.BinariesDirectory)/nuget-artifact \

tools/ci_build/github/azure-pipelines/templates/mac-ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ jobs:
3939
export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=OFF -DONNX_WERROR=OFF"
4040
sudo python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
4141
sudo xcode-select --switch /Applications/Xcode_10.app/Contents/Developer
42+
# The following line is a hack to prevent build pipeline from failing
43+
brew uninstall [email protected]
4244
brew install libomp
4345
${{ parameters.BuildCommand }}
4446
displayName: 'Build and Test OnnxRuntime lib for MacOS'

tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -788,6 +788,8 @@ stages:
788788
export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=OFF -DONNX_WERROR=OFF"
789789
sudo python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
790790
sudo xcode-select --switch /Applications/Xcode_10.app/Contents/Developer
791+
# The following line is a hack to prevent build pipeline from failing
792+
brew uninstall [email protected]
791793
brew install libomp
792794
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 }}
793795
displayName: 'Command Line Script'

0 commit comments

Comments
 (0)