From 7a108adc4a1e820a036da43e9ade8ce01bb15193 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Fri, 5 Apr 2019 00:54:51 -0400 Subject: [PATCH] Consolidated download and install steps. --- azure-pipelines/vs2015-install-latest-python3-meson.yml | 3 +-- azure-pipelines/windows-install-ninja.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/azure-pipelines/vs2015-install-latest-python3-meson.yml b/azure-pipelines/vs2015-install-latest-python3-meson.yml index 06106cfc..0f62ee64 100644 --- a/azure-pipelines/vs2015-install-latest-python3-meson.yml +++ b/azure-pipelines/vs2015-install-latest-python3-meson.yml @@ -1,9 +1,8 @@ # 4 april 2019 # see https://github.com/Microsoft/azure-pipelines-image-generation/issues/374 for context and source steps: -- powershell: 'Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\py3-setup.exe' - displayName: 'Download Python 3' - script: | + powershell -Command "Invoke-WebRequest https://www.python.org/ftp/python/3.7.1/python-3.7.1-amd64-webinstall.exe -OutFile C:\py3-setup.exe" C:\py3-setup.exe /quiet PrependPath=0 InstallAllUsers=0 Include_launcher=0 InstallLauncherAllUsers=0 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\Python37 @echo ##vso[task.prependpath]C:\Python37 @echo ##vso[task.prependpath]C:\Python37\Scripts diff --git a/azure-pipelines/windows-install-ninja.yml b/azure-pipelines/windows-install-ninja.yml index f726221e..d80aedfe 100644 --- a/azure-pipelines/windows-install-ninja.yml +++ b/azure-pipelines/windows-install-ninja.yml @@ -1,9 +1,8 @@ # 4 april 2019 # why this? because choco isn't available on the VS2015 image and is extremely slow on the VS2017 one (it should not take 2.5 minutes to install just ninja!) steps: -- powershell: 'Invoke-WebRequest https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip -OutFile C:\ninja-win.zip' - displayName: 'Download Ninja' - script: | + powershell -Command "Invoke-WebRequest https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip -OutFile C:\ninja-win.zip" mkdir C:\ninja powershell -Command "Expand-Archive -LiteralPath C:\ninja-win.zip -DestinationPath C:\ninja" @echo ##vso[task.prependpath]C:\ninja