diff options
Diffstat (limited to 'docs/markdown/Continuous-Integration.md')
| -rw-r--r-- | docs/markdown/Continuous-Integration.md | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/docs/markdown/Continuous-Integration.md b/docs/markdown/Continuous-Integration.md index 96e8e5d..60e76d1 100644 --- a/docs/markdown/Continuous-Integration.md +++ b/docs/markdown/Continuous-Integration.md @@ -52,13 +52,14 @@ your best bet. Here's a sample `yml` file for use with that. ```yaml os: Visual Studio 2015 -matrix: - - arch: x86 - compiler: msvc2010 - - arch: x86 - compiler: msvc2015 - - arch: x64 - compiler: msvc2015 +environment: + matrix: + - arch: x86 + compiler: msvc2010 + - arch: x86 + compiler: msvc2015 + - arch: x64 + compiler: msvc2015 platform: - x64 @@ -66,10 +67,10 @@ platform: install: # Use the x86 python only when building for x86 for the cpython tests. # For all other archs (including, say, arm), use the x64 python. - - ps: (new-object net.webclient).DownloadFile('https://dl.dropboxusercontent.com/u/37517477/ninja.exe', 'C:\projects\meson\ninja.exe') + - ps: (new-object net.webclient).DownloadFile('https://www.dropbox.com/s/cyghxjrvgplu7sy/ninja.exe?dl=1', 'C:\projects\meson\ninja.exe') - cmd: if %arch%==x86 (set MESON_PYTHON_PATH=C:\python34) else (set MESON_PYTHON_PATH=C:\python34-x64) - cmd: echo Using Python at %MESON_PYTHON_PATH% - - cmd: %MESON_PYTHON_PATH%\pip install meson + - cmd: "%MESON_PYTHON_PATH%\\pip install meson" - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) |