diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-04-07 03:06:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-07 13:06:02 +1200 |
| commit | 942709407ebce7040b86d655679f26d47b932087 (patch) | |
| tree | 2b3008b5d481171fd65f701991307179980957db /appveyor.yml | |
| parent | 9b6a708df7eeb5264ae2f4e1c320db892b03899c (diff) | |
| download | PROJ-942709407ebce7040b86d655679f26d47b932087.tar.gz PROJ-942709407ebce7040b86d655679f26d47b932087.zip | |
appveyor.yml: reduce to 2 configurations (still testing the same number of variables) [skip travis] (#2133)
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/appveyor.yml b/appveyor.yml index c34c935f..8cc8c5be 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,3 @@ -platform: -- x64 -- x86 - branches: except: - /(cherry-pick-)?backport-\d+-to-/ @@ -10,12 +6,16 @@ environment: matrix: # VS 2015 - - VS_VERSION: Visual Studio 14 + - platform: x86 + VS_VERSION: Visual Studio 14 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + BUILD_SHARED_LIBS: OFF # VS 2017 - - VS_VERSION: Visual Studio 15 + - platform: x64 + VS_VERSION: Visual Studio 15 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + BUILD_SHARED_LIBS: ON shallow_clone: true @@ -33,9 +33,7 @@ build_script: - dir C:\Tools\vcpkg\installed\%platform%-windows\bin - set PATH=C:\Tools\vcpkg\installed\%platform%-windows\bin;%PATH% - if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64 - - if "%platform%" == "x64" SET BUILD_SHARED_LIBS=ON - if "%platform%" == "x86" SET VS_FULL=%VS_VERSION% - - if "%platform%" == "x86" SET BUILD_SHARED_LIBS=OFF - echo "%VS_FULL%" # - set PROJ_BUILD=%APPVEYOR_BUILD_FOLDER%\build |