10000 Merge pull request #16640 from matplotlib/azure-v3.2.x · matplotlib/matplotlib@ea34bd1 · GitHub
[go: up one dir, main page]
Skip to content

Commit ea34bd1

Browse files
tacaswelltacaswell
authored
Merge pull request #16640 from matplotlib/azure-v3.2.x
CI: Fix Azure on v3.2.x
2 parents e7fbf88 + 9bf0fef commit ea34bd1

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

‎azure-pipelines.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,12 @@ steps:
5252
prerelease: true
5353
condition: and(succeeded(), eq(variables['python.version'], 'Pre'))
5454

55+
- task: NuGetToolInstaller@0
56+
displayName: 'Use latest available Nuget'
57+
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
58+
5559
- bash: |
60+
set -e
5661
case "$(python -c 'import sys; print(sys.platform)')" in
5762
linux)
5863
sudo apt-get update
@@ -83,10 +88,10 @@ steps:
8388
win32)
8489
nuget install libpng-msvc14-x64 -ExcludeVersion -OutputDirectory "$(build.BinariesDirectory)"
8590
nuget install zlib-msvc14-x64 -ExcludeVersion -OutputDirectory "$(build.BinariesDirectory)"
86-
echo ##vso[task.prependpath]$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\bin_release
87-
echo ##vso[task.prependpath]$(build.BinariesDirectory)\zlib-msvc14-x64\build\native\bin_release
88-
echo ##vso[task.setvariable variable=CL]/I$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\include /I$(build.BinariesDirectory)\zlib-msvc14-x64\build\native\include
89-
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
91+
echo "##vso[task.prependpath]$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\bin_release"
92+
echo "##vso[task.prependpath]$(build.BinariesDirectory)\zlib-msvc14-x64\build\native\bin_release"
93+
echo "##vso[task.setvariable variable=CL]/I$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\include /I$(build.BinariesDirectory)\zlib-msvc14-x64\build\native\include"
94+
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"
9095
;;
9196
*)
9297
exit 1

0 commit comments

Comments
 (0)
0