diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-11-15 12:25:45 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-11-16 20:26:02 +0530 |
| commit | 1a3b3857c91d4288d875a752e400ed98fa3801a6 (patch) | |
| tree | 7dd41c80fd9e6d7e2972a8c23e6cc01ea9a65b22 /ci | |
| parent | 48a10af2cf23e5c7832fd313bbb850ca7d7aec37 (diff) | |
| download | meson-1a3b3857c91d4288d875a752e400ed98fa3801a6.zip meson-1a3b3857c91d4288d875a752e400ed98fa3801a6.tar.gz meson-1a3b3857c91d4288d875a752e400ed98fa3801a6.tar.bz2 | |
azure: Install x86 python in vs2015 image when building for x86
Use the x86 python when building for x86, to allow tests building python
extension modules to work
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/azure-steps.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ci/azure-steps.yml b/ci/azure-steps.yml index 81116d4..1c665ef 100644 --- a/ci/azure-steps.yml +++ b/ci/azure-steps.yml @@ -44,10 +44,14 @@ 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 --params "/InstallDir:C:\Python3" + 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 |