From f80288f0c85e5416f7680d3c215498a1c5d87a3d Mon Sep 17 00:00:00 2001 From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com> Date: Wed, 28 Oct 2020 15:03:07 -0700 Subject: [PATCH 1/7] Fixed MacOS nightly builds due to Homebrew bug --- build/vsts-ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 36874b2105..9cde936a6a 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -46,7 +46,14 @@ phases: queue: name: Hosted macOS steps: - - script: brew update && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force + # 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 cmake $(Build.SourcesDirectory)/build/libomp.rb && brew install mono-libgdiplus gettext && brew link gettext --force && brew link libomp --force displayName: Install build dependencies # Only build native assets to avoid conflicts. - script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets From ec2ec924188f42a5db5511c6f2c02bbdc82b2fcb Mon Sep 17 00:00:00 2001 From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com> Date: Wed, 28 Oct 2020 16:32:49 -0700 Subject: [PATCH 2/7] Edit workaround --- build/ci/job-template.yml | 2 +- build/vsts-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 9e5e19cfc3..036d7dcf8f 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 install $(Build.SourcesDirectory)/build/libomp.rb && brew install mono-libgdiplus && 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 9cde936a6a..9443ab9f7e 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -53,7 +53,7 @@ phases: brew untap local/openssl | brew untap local/python2 displayName: MacOS Homebrew bug Workaround - - 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 install $(Build.SourcesDirectory)/build/libomp.rb && brew install mono-libgdiplus && brew link libomp --force displayName: Install build dependencies # Only build native assets to avoid conflicts. - script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets From 956a81a409669ea4362ff255acde89e72d6c41c6 Mon Sep 17 00:00:00 2001 From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com> Date: Wed, 28 Oct 2020 16:40:53 -0700 Subject: [PATCH 3/7] Remove untapping of python2 --- build/ci/job-template.yml | 2 -- build/vsts-ci.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 036d7dcf8f..80a8e8fa93 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -53,9 +53,7 @@ jobs: - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}: - 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 - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}: - script: brew update && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew install mono-libgdiplus && brew link libomp --force diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 9443ab9f7e..0990f3cb50 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -49,9 +49,7 @@ phases: # 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 install mono-libgdiplus && brew link libomp --force displayName: Install build dependencies From e59b5e6019cccbecbda9ecfab567c16afdaa1d78 Mon Sep 17 00:00:00 2001 From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com> Date: Wed, 28 Oct 2020 16:42:27 -0700 Subject: [PATCH 4/7] Nit edit --- build/ci/job-template.yml | 2 +- build/vsts-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 80a8e8fa93..9007204453 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -53,7 +53,7 @@ jobs: - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}: - script: | brew uninstall openssl@1.0.2t | - brew untap local/openssl | + brew untap local/openssl displayName: MacOS Homebrew bug Workaround - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}: - script: brew update && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew install mono-libgdiplus && brew link libomp --force diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 0990f3cb50..bcbc1c0e9a 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -49,7 +49,7 @@ phases: # Work around MacOS Homebrew image/environment bug: https://github.com/actions/virtual-environments/issues/1811 - script: | brew uninstall openssl@1.0.2t | - brew untap local/openssl | + brew untap local/openssl displayName: MacOS Homebrew bug Workaround - script: brew update && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew install mono-libgdiplus && brew link libomp --force displayName: Install build dependencies From 45068231e46bb45328c21d1d1c5be9c1c809caf2 Mon Sep 17 00:00:00 2001 From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com> Date: Wed, 28 Oct 2020 16:50:12 -0700 Subject: [PATCH 5/7] Remove installation of mono-libgdiplus --- build/ci/job-template.yml | 6 ++++-- build/vsts-ci.yml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 9007204453..08b3a222f8 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -53,10 +53,12 @@ jobs: - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}: - script: | brew uninstall openssl@1.0.2t | - brew untap local/openssl + brew uninstall python@2.7.17 | + brew untap local/openssl | + brew untap local/python2 displayName: MacOS Homebrew bug Workaround - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}: - - script: brew update && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew install mono-libgdiplus && brew link libomp --force + - script: brew update && 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 bcbc1c0e9a..98dfa10e4a 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -49,9 +49,11 @@ phases: # Work around MacOS Homebrew image/environment bug: https://github.com/actions/virtual-environments/issues/1811 - script: | brew uninstall openssl@1.0.2t | - brew untap local/openssl + 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 install mono-libgdiplus && brew link libomp --force + - 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. - script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets From 17fbd48a56d5235323ece131e8ff61e72b492af7 Mon Sep 17 00:00:00 2001 From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com> Date: Wed, 28 Oct 2020 17:49:48 -0700 Subject: [PATCH 6/7] try installing mono-libgdiplus --- build/ci/job-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 08b3a222f8..00eb9dc4c7 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 $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force + - script: brew update && 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" From 00c5c0ab8502d9263ada86603b0ee67bff9d2a99 Mon Sep 17 00:00:00 2001 From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com> Date: Wed, 28 Oct 2020 17:54:26 -0700 Subject: [PATCH 7/7] unlink python 3.8 --- build/ci/job-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 00eb9dc4c7..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 mono-libgdiplus && brew install $(Build.SourcesDirectory)/build/libomp.rb && 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"