diff options
| author | PROJ-BOT <59655370+PROJ-BOT@users.noreply.github.com> | 2020-04-07 04:17:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-07 14:17:00 +1200 |
| commit | e62a4a4cb03a7e07fbcd33fe385e5909aab1516b (patch) | |
| tree | 67054c0ccaf5adb84530b6eb547bf881b1ebf1b0 | |
| parent | dec8a20b5a706e8ddcf1173264da74a3664fd20a (diff) | |
| download | PROJ-e62a4a4cb03a7e07fbcd33fe385e5909aab1516b.tar.gz PROJ-e62a4a4cb03a7e07fbcd33fe385e5909aab1516b.zip | |
appveyor.yml: reduce to 2 configurations (still testing the same number of variables) (#2136)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
| -rw-r--r-- | appveyor.yml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/appveyor.yml b/appveyor.yml index 2d5e0f2e..52c2c18a 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 @@ -30,9 +30,7 @@ build_script: - vcpkg install tiff:"%platform%"-windows - vcpkg install curl:"%platform%"-windows - 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 |