diff --git a/.appveyor.yml b/.appveyor.yml index 88da12a4..9757d77b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,7 +5,7 @@ version: git-{build} skip_tags: true # VM Template -image: Visual Studio 2015 +image: Visual Studio 2017 # Clone depth clone_depth: 1 @@ -17,15 +17,15 @@ branches: # Environment variables environment: + NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip + VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat' matrix: - builder: msvc_ninja_64 - PYTHON: 'C:\\Python36-x64' + PYTHON: 'C:\\Python37-x64' BUILD_DIR: build - NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip - builder: msvc_ninja_32 - PYTHON: 'C:\\Python36' + PYTHON: 'C:\\Python37' BUILD_DIR: build - NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip # Required softwares for building install: @@ -35,9 +35,8 @@ install: # Build scripts build_script: - - cmd: if %builder% == msvc_ninja_64 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && %PYTHON%\\python.exe meson.py build && ninja -C build ) - - - cmd: if %builder% == msvc_ninja_32 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 && %PYTHON%\\python.exe meson.py build && ninja -C build ) + - cmd: if %builder% == msvc_ninja_64 ( call "%VSVARSALLPATH%" x64 && %PYTHON%\\python.exe meson.py build && ninja -C build ) + - cmd: if %builder% == msvc_ninja_32 ( call "%VSVARSALLPATH%" x86 && %PYTHON%\\python.exe meson.py build && ninja -C build ) ## Artifacts #artifacts: