azure: Fix vs2015

pull/6321/head
Daniel Mensinger 5 years ago
parent 6eb67ee848
commit 9c72d0fdb2
  1. 6
      azure-pipelines.yml
  2. 10
      ci/azure-steps.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

@ -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"
}

Loading…
Cancel
Save