From 2690bc9a9a9c7b3c80a886948321bc44cfde7654 Mon Sep 17 00:00:00 2001 From: Jordan Bayles Date: Tue, 25 Jun 2019 14:48:40 -0700 Subject: [PATCH] Update appveyor to use build images --- .travis.yml | 4 ++-- appveyor.yml | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 13f32cc..b649b46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ matrix: LIB_TYPE=static BUILD_TYPE=release script: ./.travis_scripts/meson_builder.sh - - name: xenial clang meson static release testing + - name: Linux xenial clang meson static release testing os: linux dist: xenial compiler: clang @@ -48,7 +48,7 @@ matrix: install: - source ./.travis_scripts/travis.install.${TRAVIS_OS_NAME}.sh script: ./.travis_scripts/meson_builder.sh - - name: xenial gcc cmake coverage + - name: Linux xenial gcc cmake coverage os: linux dist: xenial compiler: gcc diff --git a/appveyor.yml b/appveyor.yml index daaaeef..0b9c8fe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,10 +2,14 @@ clone_folder: c:\projects\jsoncpp environment: matrix: - - CMAKE_GENERATOR: Visual Studio 14 2015 - - CMAKE_GENERATOR: Visual Studio 14 2015 Win64 - - CMAKE_GENERATOR: Visual Studio 15 2017 - - CMAKE_GENERATOR: Visual Studio 15 2017 Win64 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + CMAKE_GENERATOR: Visual Studio 14 2015 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + CMAKE_GENERATOR: Visual Studio 14 2015 Win64 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + CMAKE_GENERATOR: Visual Studio 15 2017 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + CMAKE_GENERATOR: Visual Studio 15 2017 Win64 build_script: - cmake --version