diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-11-15 12:09:05 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-11-16 20:26:02 +0530 |
| commit | 48a10af2cf23e5c7832fd313bbb850ca7d7aec37 (patch) | |
| tree | b377992be0b25797a4346975f37f3f37fbcc3c9c /ci/azure-steps.yml | |
| parent | 301df388162153873e21a2732a9f735d1dcba022 (diff) | |
| download | meson-48a10af2cf23e5c7832fd313bbb850ca7d7aec37.zip meson-48a10af2cf23e5c7832fd313bbb850ca7d7aec37.tar.gz meson-48a10af2cf23e5c7832fd313bbb850ca7d7aec37.tar.bz2 | |
azure: Add JDK installed in vs2015 image to PATH
Add a JDK installed in vs2015 image to PATH, so java tests can be run
JDK appear to be installed in several places, so we can always pick a
different one:
C:\java\jdk\jdk1.8.0_102\bin\
C:\Program Files\Java\jdk1.8.0_102\bin
C:\Program Files (x86)\Java\jdk1.8.0_102\bin
Diffstat (limited to 'ci/azure-steps.yml')
| -rw-r--r-- | ci/azure-steps.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ci/azure-steps.yml b/ci/azure-steps.yml index 8bd8c76..81116d4 100644 --- a/ci/azure-steps.yml +++ b/ci/azure-steps.yml @@ -43,12 +43,15 @@ steps: Set-Content "env:$p" "$v" } - # download and install python3 and add to path (since it's not installed in vs2015 image!) if ($env:compiler -eq 'msvc2015') { + # 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" $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" } # test_find_program exercises some behaviour which relies on .py being in PATHEXT |