From 313c91778a5a738f9226b10384dc8c095a3a7db4 Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Thu, 7 Sep 2017 16:23:29 -0600
Subject: [PATCH] Do two jobs with each build (VS2015 and VS2017)
---
appveyor.yml | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index 3cb2a582e..7a30589a1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,7 +2,9 @@ version: 1.0.{build}
skip_branch_with_pr: true
-os: Visual Studio 2015
+os:
+ - Visual Studio 2015
+ - Visual Studio 2017
platform:
- x86
@@ -10,27 +12,30 @@ platform:
before_build:
- del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets"
- if not exist C:\projects\adios2build\NUL echo 'Build tree does not yet exist'
+- set CUSTOM_BUILD_NAME=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%_%APPVEYOR_BUILD_NUMBER%_%APPVEYOR_BUILD_WORKER_IMAGE%
- ctest.exe
-VV -S ../adios2/scripts\appveyor\av_default.cmake
-Ddashboard_full=OFF
-Ddashboard_do_update=true
- -DCTEST_BUILD_NAME=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%_%APPVEYOR_BUILD_NUMBER%_vs-2015
+ -DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%
build_script:
+- set CUSTOM_BUILD_NAME=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%_%APPVEYOR_BUILD_NUMBER%_%APPVEYOR_BUILD_WORKER_IMAGE%
- ctest.exe
-VV -S ../adios2/scripts\appveyor\av_default.cmake
-Ddashboard_full=OFF
-Ddashboard_do_configure=true
- -DCTEST_BUILD_NAME=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%_%APPVEYOR_BUILD_NUMBER%_vs-2015
+ -DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%
- ctest.exe
-VV -S ../adios2/scripts\appveyor\av_default.cmake
-Ddashboard_full=OFF
-Ddashboard_do_build=true
- -DCTEST_BUILD_NAME=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%_%APPVEYOR_BUILD_NUMBER%_vs-2015
+ -DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%
test_script:
+- set CUSTOM_BUILD_NAME=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%_%APPVEYOR_BUILD_NUMBER%_%APPVEYOR_BUILD_WORKER_IMAGE%
- ctest.exe
-VV -S ../adios2/scripts\appveyor\av_default.cmake
-Ddashboard_full=OFF
-Ddashboard_do_test=true
- -DCTEST_BUILD_NAME=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%_%APPVEYOR_BUILD_NUMBER%_vs-2015
+ -DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%
--
GitLab