epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

ci: update .ci submodule; adapt .travis.yml

Browse Source
This commit is contained in:
Ralph Lange
2019-10-05 12:02:34 -04:00
parent ee9df66168
commit 6198ad4529
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.ci

Submodule .ci updated: 45dba66437...698e6b00e8

26
.travis.yml
View File

@@ -23,50 +23,50 @@ matrix:
# Different configurations of default gcc and clang # Different configurations of default gcc and clang
- env: BASE_BRANCH=7.0 - env: BASE=7.0
- env: BASE_BRANCH=7.0 - env: BASE=7.0
compiler: clang compiler: clang
- env: BASE_BRANCH=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11" - env: BASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
- env: BASE_BRANCH=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11" - env: BASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
compiler: clang compiler: clang
# Trusty: compiler versions very close to RHEL 7 # Trusty: compiler versions very close to RHEL 7
- env: BASE_BRANCH=7.0 - env: BASE=7.0
dist: trusty dist: trusty
- env: BASE_BRANCH=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11" - env: BASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
dist: trusty dist: trusty
# Cross-compilation to Windows using MinGW and WINE # Cross-compilation to Windows using MinGW and WINE
- env: BASE_BRANCH=7.0 WINE=32 TEST=NO STATIC=YES - env: BASE=7.0 WINE=32 TEST=NO STATIC=YES
compiler: mingw compiler: mingw
- env: BASE_BRANCH=7.0 WINE=32 TEST=NO STATIC=NO - env: BASE=7.0 WINE=32 TEST=NO STATIC=NO
compiler: mingw compiler: mingw
# Cross-compilation to RTEMS # Cross-compilation to RTEMS
- env: BASE_BRANCH=7.0 RTEMS=4.10 TEST=NO - env: BASE=7.0 RTEMS=4.10 TEST=NO
- env: BASE_BRANCH=7.0 RTEMS=4.9 TEST=NO - env: BASE=7.0 RTEMS=4.9 TEST=NO
# Other gcc versions (adding as an extra package) # Other gcc versions (adding as an extra package)
- env: BASE_BRANCH=7.0 - env: BASE=7.0
compiler: gcc-6 compiler: gcc-6
addons: { apt: { packages: ["g++-6"], sources: ["ubuntu-toolchain-r-test"] } } addons: { apt: { packages: ["g++-6"], sources: ["ubuntu-toolchain-r-test"] } }
- env: BASE_BRANCH=7.0 - env: BASE=7.0
compiler: gcc-7 compiler: gcc-7
addons: { apt: { packages: ["g++-7"], sources: ["ubuntu-toolchain-r-test"] } } addons: { apt: { packages: ["g++-7"], sources: ["ubuntu-toolchain-r-test"] } }
# MacOS build # MacOS build
- env: BASE_BRANCH=7.0 - env: BASE=7.0
os: osx os: osx
compiler: clang compiler: clang