diff options
| -rw-r--r-- | azure-pipelines.yml | 6 | ||||
| -rw-r--r-- | ci/azure-steps.yml | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e62dde5..b7f2a77 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,6 +28,12 @@ jobs: backend: vs2015 steps: + - powershell: 'Invoke-WebRequest https://www.python.org/ftp/python/3.7.4/python-3.7.4.exe -OutFile c:\py3-setup.exe' + - script: | + c:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_doc=0 Include_dev=0 Include_debug=0 TargetDir=c:\Python3 + - script: | + @echo ##vso[task.prependpath]C:\Python3 + @echo ##vso[task.prependpath]C:\Python3\Scripts - template: ci/azure-steps.yml - job: vs2017 diff --git a/ci/azure-steps.yml b/ci/azure-steps.yml index 2376659..34c658b 100644 --- a/ci/azure-steps.yml +++ b/ci/azure-steps.yml @@ -51,16 +51,6 @@ steps: } if ($env:compiler -eq 'msvc2015') { - if ($env:arch -eq 'x86') { - $forcex86 = "--forcex86" - } - - # download and install python3 and add to path (since it's not installed in vs2015 image!) - Set-ExecutionPolicy Bypass -Scope Process -Force - iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - choco install python3 -y --no-progress $forcex86 --params "/InstallDir:C:\Python3" - $env:Path = "C:\Python3;$env:Path" - # add JDK installed in vs2015 image to PATH $env:Path = "C:\java\jdk\jdk1.8.0_102\bin\;$env:Path" } |