From 0193ba7f0d12fd486f7fc071305ceb00af0d59c5 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 27 Dec 2019 16:44:16 -0800 Subject: [PATCH 01/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index a6285c0b..02bb9892 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f5b1ac99a7fba27c19cee0bc4f036775c889b359/Formula/libomp.rb mono-libgdiplus gettext && brew link gettext --force + - script: brew update && brew install libomp mono-libgdiplus gettext && brew link gettext --force - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From 1e5d79d47a8842d972490894d9cb325f8770fb22 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 27 Dec 2019 16:53:22 -0800 Subject: [PATCH 02/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 02bb9892..a6295557 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install libomp mono-libgdiplus gettext && brew link gettext --force + - script: brew update && brew install libomp mono-libgdiplus gettext && LDFLAGS="-L/usr/local/opt/libffi/lib" && brew link gettext --force - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From d9b19d5b066a3375d2061b33a3eae2456f0fefb5 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 27 Dec 2019 16:58:04 -0800 Subject: [PATCH 03/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index a6295557..e2379010 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install libomp mono-libgdiplus gettext && LDFLAGS="-L/usr/local/opt/libffi/lib" && brew link gettext --force + - script: brew update && brew install libomp mono-libgdiplus gettext && export LDFLAGS="-L/usr/local/opt/libffi/lib" && brew link gettext --force - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From bd627d3f6fb7cace63b676aa9468aaa2563c7d8c Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 27 Dec 2019 17:34:12 -0800 Subject: [PATCH 04/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index e2379010..e5856e16 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install libomp mono-libgdiplus gettext && export LDFLAGS="-L/usr/local/opt/libffi/lib" && brew link gettext --force + - script: brew update && brew install libomp mono-libgdiplus && export LDFLAGS="-L/usr/local/opt/libffi/lib" && brew link gettext --force - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From 4840437bc308e64bd0826519cbd1f0986f339a1c Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Thu, 2 Jan 2020 15:54:14 -0500 Subject: [PATCH 05/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index e5856e16..77d482e1 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install libomp mono-libgdiplus && export LDFLAGS="-L/usr/local/opt/libffi/lib" && brew link gettext --force + - script: brew update && brew install libomp mono-libgdiplus && brew link --overwrite python && brew link gettext --force - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From 87103b2219e6aaba3bac062e671a0cce78628338 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Thu, 2 Jan 2020 16:05:03 -0500 Subject: [PATCH 06/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 77d482e1..e94896d7 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install libomp mono-libgdiplus && brew link --overwrite python && brew link gettext --force + - script: brew update && brew unlink python@2 && brew install libomp mono-libgdiplus && brew link gettext --force - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From ea2a4b841dcf91bce69d8f4bbd406bed3d4e5f81 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 11:03:38 -0800 Subject: [PATCH 07/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index e94896d7..83e48eef 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew unlink python@2 && brew install libomp mono-libgdiplus && brew link gettext --force + - script: brew update && brew unlink python@2 && brew install libomp mono-libgdiplus && brew link gettext --force && brew install python@2 - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From e01faef6762aef83c7f06774038394d76a6089d4 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 11:15:16 -0800 Subject: [PATCH 08/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 83e48eef..add1db23 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew unlink python@2 && brew install libomp mono-libgdiplus && brew link gettext --force && brew install python@2 + - script: brew update && brew unlink python@2 && brew install libomp mono-libgdiplus && brew link gettext --force && brew link python@2 - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From 08c33615a08e02fba4bff4459c95e9d9b2476ba8 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 11:20:36 -0800 Subject: [PATCH 09/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index add1db23..9364a002 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew unlink python@2 && brew install libomp mono-libgdiplus && brew link gettext --force && brew link python@2 + - script: brew update && brew unlink python@2 && brew install libomp mono-libgdiplus && brew link gettext --force && brew link --overwrite python@2 - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From 872d13bb08c956280e247cf64bccd0265ec03f31 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 11:28:33 -0800 Subject: [PATCH 10/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 9364a002..6494ddff 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew unlink python@2 && brew install libomp mono-libgdiplus && brew link gettext --force && brew link --overwrite python@2 + - script: brew update && brew unlink python && brew install libomp mono-libgdiplus && brew link gettext --force - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From 7c92a70051f04cfe851419a6117302d9d921b598 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 11:33:51 -0800 Subject: [PATCH 11/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 6494ddff..f5c8574f 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew unlink python && brew install libomp mono-libgdiplus && brew link gettext --force + - script: brew update && brew install mono-libgdiplus && brew link gettext --force - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From 62384af04c1ea10fded4a8d3a1da4251e41af90e Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 11:41:58 -0800 Subject: [PATCH 12/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index f5c8574f..9ebf6238 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install mono-libgdiplus && brew link gettext --force + - script: brew update && brew link python && brew install libomp mono-libgdiplus && brew link gettext --force - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From ef73a30baa286038a6c797af5d232dee8e6d9eb0 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 11:49:32 -0800 Subject: [PATCH 13/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 9ebf6238..998b8437 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew link python && brew install libomp mono-libgdiplus && brew link gettext --force + - script: brew unlink python@2 && brew update && brew install libomp mono-libgdiplus && brew link gettext --force - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From eece6763d9645274140781e0d76a2f6660b366c2 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 11:58:09 -0800 Subject: [PATCH 14/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 998b8437..597a2305 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew unlink python@2 && brew update && brew install libomp mono-libgdiplus && brew link gettext --force + - script: brew unlink python@2 && brew update && brew install libomp mono-libgdiplus && brew update && brew link gettext --force - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From 2f92741b939848668874f17ab94b610a23a73a07 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 13:16:03 -0800 Subject: [PATCH 15/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 597a2305..4dc6df58 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew unlink python@2 && brew update && brew install libomp mono-libgdiplus && brew update && brew link gettext --force + - script: brew update && brew install libomp && brew install glib cairo libexif libjpeg giflib libtiff autoconf libtool automake pango pkg-config && brew link gettext --force && brew install mono-libgdiplus --ignore-dependencies - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From f84e59aab5b63fc70c766e81ab3b73cd04cab4b6 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 13:21:42 -0800 Subject: [PATCH 16/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 4dc6df58..99812c72 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install libomp && brew install glib cairo libexif libjpeg giflib libtiff autoconf libtool automake pango pkg-config && brew link gettext --force && brew install mono-libgdiplus --ignore-dependencies + - script: brew update && brew install libomp && brew install glib cairo libexif libjpeg giflib libtiff autoconf libtool automake pango pkg-config --ignore-dependencies && brew link gettext --force && brew install mono-libgdiplus --ignore-dependencies - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From a8b2dfe0f395ab3729ec4297be4f51685c6a39e4 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 13:31:39 -0800 Subject: [PATCH 17/27] Update phase-template.yml --- build/ci/phase-template.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 99812c72..6a69c050 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,8 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install libomp && brew install glib cairo libexif libjpeg giflib libtiff autoconf libtool automake pango pkg-config --ignore-dependencies && brew link gettext --force && brew install mono-libgdiplus --ignore-dependencies - - ${{ if eq(parameters.testDistro, 'noTests') }}: + - script: brew update && brew install libomp && brew install glib cairo libexif libjpeg giflib libtiff autoconf libtool automake pango pkg-config --ignore-dependencies && brew link gettext --force && brew install mono-libgdiplus - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) From 89422217282d4f0662684193e7940fb871b27f12 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 13:44:58 -0800 Subject: [PATCH 18/27] Update phase-template.yml --- build/ci/phase-template.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 6a69c050..1d1d1e69 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,8 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install libomp && brew install glib cairo libexif libjpeg giflib libtiff autoconf libtool automake pango pkg-config --ignore-dependencies && brew link gettext --force && brew install mono-libgdiplus - ${{ if eq(parameters.testDistro, 'noTests') }}: + - script: brew update && brew install libomp && brew install gettext libffi pcre && brew install glib --ignore-dependencies && brew install cairo libexif libjpeg giflib libtiff autoconf libtool automake pango pkg-config && brew link gettext --force && brew install mono-libgdiplus --ignore-dependencies + - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) From f1cfcfaed597a33a52e27c1db10b11ec643fb4c0 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 14:11:35 -0800 Subject: [PATCH 19/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 1d1d1e69..39a410b7 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install libomp && brew install gettext libffi pcre && brew install glib --ignore-dependencies && brew install cairo libexif libjpeg giflib libtiff autoconf libtool automake pango pkg-config && brew link gettext --force && brew install mono-libgdiplus --ignore-dependencies + - script: brew update && brew install libomp gettext && brew link gettext --force && && brew link --overwrite python && brew install mono-libgdiplus - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From ebdf5ffab3548c7eeba6b46d66d11d4309f2bc55 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 14:13:35 -0800 Subject: [PATCH 20/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 39a410b7..d7b5dc66 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install libomp gettext && brew link gettext --force && && brew link --overwrite python && brew install mono-libgdiplus + - script: brew update && brew install libomp gettext && brew link gettext --force && brew link --overwrite python && brew install mono-libgdiplus - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From 83517a2b74bb029ac344bcbf6206f8dab38cf748 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 14:25:25 -0800 Subject: [PATCH 21/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index d7b5dc66..e2c54041 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install libomp gettext && brew link gettext --force && brew link --overwrite python && brew install mono-libgdiplus + - script: brew update && brew install libomp gettext && brew link gettext --force && brew link --overwrite python && brew install mono-libgdiplus --ignore-dependencies - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From b713c5be7966622a1e0fc8e2e200c78dc84b8c87 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 14:30:02 -0800 Subject: [PATCH 22/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index e2c54041..a3f484c9 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install libomp gettext && brew link gettext --force && brew link --overwrite python && brew install mono-libgdiplus --ignore-dependencies + - script: brew update && brew install libomp gettext && brew link gettext --force && brew link --overwrite python && brew install mono-libgdiplus --ignore-dependencies && brew unlink python && brew link python - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From 43b674ed3c7328eb302304d978bc9473975ba59c Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 14:34:34 -0800 Subject: [PATCH 23/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index a3f484c9..778faf78 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install libomp gettext && brew link gettext --force && brew link --overwrite python && brew install mono-libgdiplus --ignore-dependencies && brew unlink python && brew link python + - script: brew update && brew install libomp gettext && brew link gettext --force - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From 4d744346c12c76848b82ac952f5819afc3c5525d Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 14:42:32 -0800 Subject: [PATCH 24/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 778faf78..59253c10 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install libomp gettext && brew link gettext --force + - script: brew update && brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f5b1ac99a7fba27c19cee0bc4f036775c889b359/Formula/libomp.rb gettext && brew link gettext --force - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From 349568c12b4baaeaaebc8d383d4e00c0b6a03350 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 14:59:58 -0800 Subject: [PATCH 25/27] Checking for extended tests --- .vsts-ci.yml | 1 + build/ci/phase-template.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index b217ab07..976ba836 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -27,6 +27,7 @@ phases: _configuration: RlsMacPy3.7 buildQueue: name: Hosted macOS + testOptions: --includeExtendedTests # Build all configurations for Linux # Run tests on Ubuntu16 diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 59253c10..63de5113 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,8 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - - script: brew update && brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f5b1ac99a7fba27c19cee0bc4f036775c889b359/Formula/libomp.rb gettext && brew link gettext --force + # Manual defining of the libomp URL is needed to avoid error at runtime. + - script: brew update && brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f5b1ac99a7fba27c19cee0bc4f036775c889b359/Formula/libomp.rb gettext && brew link gettext --force && brew install mono-libgdiplus --ignore-dependencies - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From 074124a079c2ba803611177274fa014620aaa11f Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 15:26:33 -0800 Subject: [PATCH 26/27] Update phase-template.yml --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 63de5113..2e9c2915 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -27,7 +27,7 @@ phases: # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: # Manual defining of the libomp URL is needed to avoid error at runtime. - - script: brew update && brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f5b1ac99a7fba27c19cee0bc4f036775c889b359/Formula/libomp.rb gettext && brew link gettext --force && brew install mono-libgdiplus --ignore-dependencies + - script: brew update && brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f5b1ac99a7fba27c19cee0bc4f036775c889b359/Formula/libomp.rb gettext && brew link gettext --force && brew unlink python@2 && brew install mono-libgdiplus - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) - ${{ if eq(parameters.testDistro, '') }}: From 9a0f61e2e7005984d0890af1a99858b7ca0bf96d Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Fri, 3 Jan 2020 15:48:52 -0800 Subject: [PATCH 27/27] Final touches --- .vsts-ci.yml | 1 - build/ci/phase-template.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 976ba836..b217ab07 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -27,7 +27,6 @@ phases: _configuration: RlsMacPy3.7 buildQueue: name: Hosted macOS - testOptions: --includeExtendedTests # Build all configurations for Linux # Run tests on Ubuntu16 diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 2e9c2915..047d95fe 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -26,7 +26,7 @@ phases: - script: $(_buildScript) --configuration $(_configuration) --runTests $(_testOptions) # Mac phases - ${{ if eq(parameters.name, 'Mac') }}: - # Manual defining of the libomp URL is needed to avoid error at runtime. + # Note: Manual defining of the libomp URL below is needed to avoid error at runtime. Installing using 'brew install libomp' results in "Intel MKL FATAL ERROR: Cannot load libmkl_intel_thread.dylib." - script: brew update && brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f5b1ac99a7fba27c19cee0bc4f036775c889b359/Formula/libomp.rb gettext && brew link gettext --force && brew unlink python@2 && brew install mono-libgdiplus - ${{ if eq(parameters.testDistro, 'noTests') }}: - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration)