diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-10-10 18:00:45 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-11-13 16:13:44 +0000 |
| commit | a59978cfa2287fe2c116cd9edf53559306692fe9 (patch) | |
| tree | f59c9a31104365e26a1be9df0ba862b8396bd25a | |
| parent | 5ec4da7829e27325661448240db14be59053f54b (diff) | |
| download | meson-a59978cfa2287fe2c116cd9edf53559306692fe9.zip meson-a59978cfa2287fe2c116cd9edf53559306692fe9.tar.gz meson-a59978cfa2287fe2c116cd9edf53559306692fe9.tar.bz2 | |
azure: Enable vs2015 jobs
Don't run MPI runtime installer, which fails with vs2015 image
| -rw-r--r-- | azure-pipelines.yml | 36 | ||||
| -rw-r--r-- | ci/azure-steps.yml | 7 |
2 files changed, 23 insertions, 20 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5f7e3c4..abfd1a3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,24 +10,24 @@ variables: CI: 1 jobs: -#- job: vs2015 -# pool: -# vmImage: vs2015-win2012r2 -# -# strategy: -# maxParallel: 10 -# matrix: -# vc2015x86ninja: -# arch: x86 -# compiler: msvc2015 -# backend: ninja -# vc2015x86vs: -# arch: x86 -# compiler: msvc2015 -# backend: vs2015 -# -# steps: -# - template: ci/azure-steps.yml +- job: vs2015 + pool: + vmImage: vs2015-win2012r2 + + strategy: + maxParallel: 10 + matrix: + vc2015x86ninja: + arch: x86 + compiler: msvc2015 + backend: ninja + vc2015x86vs: + arch: x86 + compiler: msvc2015 + backend: vs2015 + + steps: + - template: ci/azure-steps.yml - job: vs2017 pool: diff --git a/ci/azure-steps.yml b/ci/azure-steps.yml index 1c7e125..db532c8 100644 --- a/ci/azure-steps.yml +++ b/ci/azure-steps.yml @@ -31,8 +31,11 @@ steps: DownloadFile -Source 'http://nirbheek.in/files/binaries/pkg-config/win32/pkg-config.exe' -Destination $(System.WorkFolder)\pkg-config.exe DownloadFile -Source 'https://download.microsoft.com/download/D/B/B/DBB64BA1-7B51-43DB-8BF1-D1FB45EACF7A/msmpisdk.msi' -Destination msmpisdk.msi DownloadFile -Source 'https://download.microsoft.com/download/D/B/B/DBB64BA1-7B51-43DB-8BF1-D1FB45EACF7A/MSMpiSetup.exe' -Destination MSMpiSetup.exe - Start-Process msiexec.exe -ArgumentList '/i msmpisdk.msi /quiet' -Wait - Start-Process .\MSMpiSetup.exe -ArgumentList '-unattend -full' -Wait + if ($env:compiler -ne 'msvc2015') { + Start-Process msiexec.exe -ArgumentList '/i msmpisdk.msi /quiet' -Wait + # installer fails "requires an interactive window station" with vs2015 image + Start-Process .\MSMpiSetup.exe -ArgumentList '-unattend -full' -Wait + } # import ms-mpi env vars (set by installer) foreach ($p in "MSMPI_INC", "MSMPI_LIB32", "MSMPI_LIB64") { |