Simplifying env vars in appveyor matrix

This commit is contained in:
Michael Tryby
2018-05-23 10:18:33 -04:00
parent 03fee3a344
commit 5af1ebfdf7

View File

@@ -18,14 +18,12 @@ matrix:
environment: environment:
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
VS_VERSION: "10 2010" GENERATOR: "Visual Studio 10 2010"
ARCH: Win32
GROUP: "SUPPORTED" GROUP: "SUPPORTED"
BOOST_ROOT: "C:/Libraries/boost" BOOST_ROOT: "C:/Libraries/boost"
# New build on Visual Studio 15 2017 # New build on Visual Studio 15 2017
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
VS_VERSION: "15 2017" GENERATOR: "Visual Studio 15 2017 Win64"
ARCH: Win64
GROUP: "EXPERIMENTAL" GROUP: "EXPERIMENTAL"
BOOST_ROOT: "C:/Libraries/boost_1_67_0" BOOST_ROOT: "C:/Libraries/boost_1_67_0"
@@ -35,11 +33,8 @@ init:
- set BUILD_HOME=buildprod - set BUILD_HOME=buildprod
- set TEST_HOME=nrtestsuite - set TEST_HOME=nrtestsuite
- set NRTEST_SCRIPT=C:\Python27\Scripts - set NRTEST_SCRIPT=C:\Python27\Scripts
- if "%ARCH%"=="Win64" (set VS_ARCH= Win64)
- set GENERATOR="Visual Studio %VS_VERSION% %VS_ARCH%"
# See values set # See values set
- echo %APPVEYOR_BUILD_WORKER_IMAGE% - echo %APPVEYOR_BUILD_WORKER_IMAGE%
- echo %ARCH%
- echo %BUILD_HOME% - echo %BUILD_HOME%
- echo %GENERATOR% - echo %GENERATOR%
- echo %BOOST_ROOT% - echo %BOOST_ROOT%