Ensures nuget is available on PATH

zooba · anntzer · commit 6ba91c973018 · 2019-01-02T14:47:12.000+01:00
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -20,6 +20,7 @@ jobs:
     - template: ci/azure-pipelines-steps.yml
       parameters:
         platform: ubuntu
+        installer: apt
 
 - job: 'Windows_Test'
   pool:
@@ -30,15 +31,15 @@ jobs:
         python.version: '3.6'
       Python37:
         python.version: '3.7'
-      # Disabled until a required extension is installed
-      #PythonPreview:
-      #  python.version: 'Pre'
+      PythonPreview:
+        python.version: 'Pre'
     maxParallel: 4
 
   steps:
     - template: ci/azure-pipelines-steps.yml
       parameters:
         platform: windows
+        installer: nuget
 
 - job: 'macOS_Test'
   pool:
@@ -55,3 +56,4 @@ jobs:
     - template: ci/azure-pipelines-steps.yml
       parameters:
         platform: macos
+        installer: brew
diff --git a/ci/azure-pipelines-steps.yml b/ci/azure-pipelines-steps.yml
@@ -1,5 +1,6 @@
 parameters:
   platform: none
+  installer: none
 
 steps:
 - task: UsePythonVersion@0
@@ -15,19 +16,23 @@ steps:
     prerelease: true
   condition: and(succeeded(), eq(variables['python.version'], 'Pre'))
 
-- ${{ if eq(parameters.platform, 'windows') }}:
+- ${{ if eq(parameters.installer, 'nuget') }}:
+  - task: NuGetToolInstaller@0
+    displayName: 'Use latest available Nuget'
+
   - script: |
       nuget install libpng-msvc14-x64 -ExcludeVersion -OutputDirectory "$(build.BinariesDirectory)"
       echo ##vso[task.setvariable variable=MPLBASEDIRLIST]win32_static;$(build.BinariesDirectory)\libpng-msvc14-x64\build\native
       echo ##vso[task.setvariable variable=LIBDIR]%LIBDIR%;$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\lib_release
       echo ##vso[task.prependpath]$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\bin_release
+    displayName: 'Install dependencies with nuget'
 
-- ${{ if eq(parameters.platform, 'macos') }}:
+- ${{ if eq(parameters.installer, 'brew') }}:
   - script: |
       brew install pkg-config ffmpeg imagemagick mplayer ccache
     displayName: 'Install dependencies with brew'
 
-- ${{ if eq(parameters.platform, 'ubuntu') }}:
+- ${{ if eq(parameters.installer, 'apt') }}:
   - script: |
       sudo apt-add-repository ppa:jonathonf/ffmpeg-3
       sudo apt-get update
