Skip to content

Commit

Permalink
Merge pull request #199 from ralphlange/fix-ci
Browse files Browse the repository at this point in the history
Fix CI issues
  • Loading branch information
ralphlange authored Dec 24, 2024
2 parents 7abba6d + 9c737a8 commit dafb6aa
Show file tree
Hide file tree
Showing 8 changed files with 214 additions and 741 deletions.
33 changes: 22 additions & 11 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,40 @@ configuration:
- dynamic-debug
- static-debug

# Default OS Image
image: Visual Studio 2019

# Environment variables: compiler toolchain, base version, setup file, ...
environment:
# common / default variables for all jobs
SETUP_PATH: .ci-local:.ci
BASE: 7.0

matrix:
- BASE: 3.15
CMP: vs2019
- BASE: 7.0
CMP: vs2019
- BASE: 7.0
CMP: gcc
- BASE: 7.0
CMP: vs2017
- CMP: vs2019
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- CMP: vs2019
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
BASE: 3.15
- CMP: vs2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- CMP: vs2015
- CMP: vs2013
- CMP: gcc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
# TODO: static linking w/ readline isn't working. Bypass auto-detect
COMMANDLINE_LIBRARY: EPICS

# Platform: processor architecture
platform:
- x64

# Matrix configuration: exclude sets of jobs
matrix:
exclude:
# MinGW debug builds use the same libraries, unlike VS
- configuration: dynamic-debug
CMP: gcc
- configuration: static-debug
CMP: gcc

#---------------------------------#
# building & testing #
#---------------------------------#
Expand Down
23 changes: 0 additions & 23 deletions .ci-local/travis-fixup.sh

This file was deleted.

381 changes: 0 additions & 381 deletions .cproject

This file was deleted.

Loading

0 comments on commit dafb6aa

Please sign in to comment.