diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 9e5e19cfc3..5f7b888fba 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -58,7 +58,7 @@ jobs: brew untap local/python2 displayName: MacOS Homebrew bug Workaround - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}: - - script: brew update && brew install cmake $(Build.SourcesDirectory)/build/libomp.rb && brew install mono-libgdiplus gettext && brew link gettext --force && brew link libomp --force + - script: brew update && brew unlink python@3.8 && brew install mono-libgdiplus && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force displayName: Install build dependencies - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1604')) }}: - 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 36874b2105..98dfa10e4a 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -46,6 +46,13 @@ phases: queue: name: Hosted macOS steps: + # Work around MacOS Homebrew image/environment bug: https://github.com/actions/virtual-environments/issues/1811 + - script: | + brew uninstall openssl@1.0.2t | + brew uninstall python@2.7.17 | + brew untap local/openssl | + brew untap local/python2 + displayName: MacOS Homebrew bug Workaround - script: brew update && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force displayName: Install build dependencies # Only build native assets to avoid conflicts.