From 29f2c5ef9354d7d2de7998c4b32298c069a01b8a Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 2 Mar 2020 20:30:20 -0500 Subject: [PATCH 1/3] ci: Exit early if 'Install dependencies' task fails. --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a0dfea9c1ee0..a4ed83b5a752 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -53,6 +53,7 @@ steps: condition: and(succeeded(), eq(variables['python.version'], 'Pre')) - bash: | + set -e case "$(python -c 'import sys; print(sys.platform)')" in linux) sudo apt-get update From 1f8dbb9fa231a0c0df9da1a7a0b355e23d13702f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 2 Mar 2020 20:42:41 -0500 Subject: [PATCH 2/3] ci: Install nuget on Azure for v3.2.x. --- azure-pipelines.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a4ed83b5a752..cc26f3b85831 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -52,6 +52,10 @@ steps: prerelease: true condition: and(succeeded(), eq(variables['python.version'], 'Pre')) +- task: NuGetToolInstaller@0 + displayName: 'Use latest available Nuget' + condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT')) + - bash: | set -e case "$(python -c 'import sys; print(sys.platform)')" in From 9bf0fef5d0654dd404cbfb88740b834fcbbe283f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 2 Mar 2020 22:07:30 -0500 Subject: [PATCH 3/3] ci: Fix setting nuget search paths. Of course, in bash, the hash is a comment, so it needs to be quoted. --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cc26f3b85831..b5ccf41a788e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -88,10 +88,10 @@ steps: win32) nuget install libpng-msvc14-x64 -ExcludeVersion -OutputDirectory "$(build.BinariesDirectory)" nuget install zlib-msvc14-x64 -ExcludeVersion -OutputDirectory "$(build.BinariesDirectory)" - echo ##vso[task.prependpath]$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\bin_release - echo ##vso[task.prependpath]$(build.BinariesDirectory)\zlib-msvc14-x64\build\native\bin_release - echo ##vso[task.setvariable variable=CL]/I$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\include /I$(build.BinariesDirectory)\zlib-msvc14-x64\build\native\include - echo ##vso[task.setvariable variable=LINK]/LIBPATH:$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\lib_release /LIBPATH:$(build.BinariesDirectory)\zlib-msvc14-x64\build\native\lib_release + echo "##vso[task.prependpath]$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\bin_release" + echo "##vso[task.prependpath]$(build.BinariesDirectory)\zlib-msvc14-x64\build\native\bin_release" + echo "##vso[task.setvariable variable=CL]/I$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\include /I$(build.BinariesDirectory)\zlib-msvc14-x64\build\native\include" + echo "##vso[task.setvariable variable=LINK]/LIBPATH:$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\lib_release /LIBPATH:$(build.BinariesDirectory)\zlib-msvc14-x64\build\native\lib_release" ;; *) exit 1