Skip to content

Commit 13fd3c6

Browse files
author
Keren Fuentes
committed
restoring files
1 parent e4ea4fe commit 13fd3c6

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

build/ci/job-template.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
continueOnError: true
6464
# Extra MacOS step required to install OS-specific dependencies
6565
- ${{ if eq(parameters.pool.name, 'Hosted macOS') }}:
66-
- script: brew update && brew install mono-libgdiplus && brew link --overwrite [email protected] && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force
66+
- script: brew update && brew install mono-libgdiplus && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force
6767
displayName: Install MacOS build dependencies
6868
- ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1604')) }}:
6969
- bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH"

build/vsts-ci.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,14 @@ phases:
5050
queue:
5151
name: Hosted macOS
5252
steps:
53-
- script: brew update && brew unlink [email protected] && brew untap local/bin/2to3 && brew install mono-libgdiplus && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force
53+
- script: |
54+
brew uninstall [email protected] |
55+
brew uninstall [email protected] |
56+
brew untap local/openssl |
57+
brew untap local/python2
58+
displayName: MacOS Homebrew bug Workaround
59+
continueOnError: true
60+
- script: brew update && brew unlink [email protected] && brew install mono-libgdiplus && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force
5461
displayName: Install build dependencies
5562
- script: ./restore.sh
5663
displayName: restore all projects

0 commit comments

Comments
 (0)