Skip to content

Commit 811884a

Browse files
committed
Merge branch 'test-appveyor-vs2015'
2 parents 647c030 + 987b8c4 commit 811884a

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

.appveyor.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ skip_commits:
1616

1717
# Build worker image (VM template)
1818
image:
19+
- Visual Studio 2015
1920
- Visual Studio 2017
2021

2122
# set clone depth
@@ -33,18 +34,28 @@ init:
3334
- git --version
3435
- python --version
3536
- cmake --version
37+
- ps: >-
38+
if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015") {
39+
$env:CMAKE_GENERATOR="Visual Studio 14 2015 Win64"
40+
} else {
41+
$env:CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
42+
}
3643
3744
# environment variables
3845
environment:
3946
CMAKE_PREFIX_PATH: C:\projects\_install;
40-
CMAKE_GENERATOR: Visual Studio 15 2017 Win64
4147
BOOST_ROOT: C:\Libraries\boost_1_65_1
4248
PATH: C:\Python36-x64;%PATH%
4349
FREETYPE_DIR: C:\projects\_install\panda3d-thirdparty\win-libs-vc14-x64\freetype
4450

4551
# this is how to allow failing jobs in the matrix
4652
matrix:
4753
fast_finish: true # set this flag to immediately finish build once one of the jobs fails.
54+
exclude:
55+
- configuration: Debug
56+
image: Visual Studio 2015
57+
- configuration: RelWithDebInfo
58+
image: Visual Studio 2015
4859

4960
# scripts that run after cloning repository
5061
install:
@@ -124,7 +135,7 @@ deploy: off
124135
# on successful build
125136
on_success:
126137
- ps: >-
127-
if (($env:CONFIGURATION -eq "Release") -and ($env:APPVEYOR_REPO_BRANCH -eq "master")) {
138+
if (($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2017") -and ($env:CONFIGURATION -eq "Release") -and ($env:APPVEYOR_REPO_BRANCH -eq "master")) {
128139
Start-AppveyorBuild -ApiKey $env:api_key -ProjectSlug 'rpcpp-plugins' -EnvironmentVariables @{
129140
TRIGGER_NAME = $env:APPVEYOR_PROJECT_NAME
130141
TRIGGER_BUILD_VERSION = $env:APPVEYOR_BUILD_VERSION

0 commit comments

Comments
 (0)