Skip to content

Commit dafb6aa

Browse files
authored
Merge pull request #199 from ralphlange/fix-ci
Fix CI issues
2 parents 7abba6d + 9c737a8 commit dafb6aa

File tree

8 files changed

+214
-741
lines changed

8 files changed

+214
-741
lines changed

.appveyor.yml

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,40 @@ configuration:
3131
- dynamic-debug
3232
- static-debug
3333

34-
# Default OS Image
35-
image: Visual Studio 2019
36-
3734
# Environment variables: compiler toolchain, base version, setup file, ...
3835
environment:
3936
# common / default variables for all jobs
4037
SETUP_PATH: .ci-local:.ci
38+
BASE: 7.0
4139

4240
matrix:
43-
- BASE: 3.15
44-
CMP: vs2019
45-
- BASE: 7.0
46-
CMP: vs2019
47-
- BASE: 7.0
48-
CMP: gcc
49-
- BASE: 7.0
50-
CMP: vs2017
41+
- CMP: vs2019
42+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
43+
- CMP: vs2019
44+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
45+
BASE: 3.15
46+
- CMP: vs2017
5147
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
48+
- CMP: vs2015
49+
- CMP: vs2013
50+
- CMP: gcc
51+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
52+
# TODO: static linking w/ readline isn't working. Bypass auto-detect
53+
COMMANDLINE_LIBRARY: EPICS
5254

5355
# Platform: processor architecture
5456
platform:
5557
- x64
5658

59+
# Matrix configuration: exclude sets of jobs
60+
matrix:
61+
exclude:
62+
# MinGW debug builds use the same libraries, unlike VS
63+
- configuration: dynamic-debug
64+
CMP: gcc
65+
- configuration: static-debug
66+
CMP: gcc
67+
5768
#---------------------------------#
5869
# building & testing #
5970
#---------------------------------#

.ci-local/travis-fixup.sh

Lines changed: 0 additions & 23 deletions
This file was deleted.

.cproject

Lines changed: 0 additions & 381 deletions
This file was deleted.

0 commit comments

Comments
 (0)