Skip to content

Commit 77d49b9

Browse files
author
Remigiusz Kołłątaj
committed
Split Travis Linux builds to separate jobs
Signed-off-by: Remigiusz Kołłątaj <[email protected]>
1 parent 1b7205f commit 77d49b9

File tree

3 files changed

+32
-6
lines changed

3 files changed

+32
-6
lines changed

.travis.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,37 @@ matrix:
1010
sudo: required
1111
services: docker
1212
group: edge
13+
env:
14+
- CC=gcc-6
15+
- CXX=g++-6
16+
- CMAKE_BUILD_TYPE=Debug
17+
- WITH_COVERAGE=ON
18+
- PACKAGE=OFF
19+
- DOXYGEN=OFF
20+
- os: linux
21+
dist: trusty
22+
sudo: required
23+
services: docker
24+
group: edge
25+
env:
26+
- CC=gcc-53
27+
- CXX=g++-53
28+
- CMAKE_BUILD_TYPE=Release
29+
- WITH_COVERAGE=OFF
30+
- PACKAGE=ON
31+
- DOXYGEN=OFF
32+
- os: linux
33+
dist: trusty
34+
sudo: required
35+
services: docker
36+
group: edge
37+
env:
38+
- CC=clang-3.5
39+
- CXX=clang++-3.5
40+
- CMAKE_BUILD_TYPE=Debug
41+
- WITH_COVERAGE=OFF
42+
- PACKAGE=OFF
43+
- DOXYGEN=ON
1344
- os: osx
1445
osx_image: xcode9.4
1546

travis/build.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
set -e
44

55
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
6-
export CC=gcc-6 CXX=g++-6 CMAKE_BUILD_TYPE=Debug WITH_COVERAGE=ON PACKAGE=OFF
7-
./travis/docker_compile.sh
8-
export CC=gcc-53 CXX=g++-53 CMAKE_BUILD_TYPE=Release WITH_COVERAGE=OFF PACKAGE=ON
9-
./travis/docker_compile.sh
10-
export CC=clang-3.5 CXX=clang++-3.5 CMAKE_BUILD_TYPE=Debug WITH_COVERAGE=OFF PACKAGE=OFF
116
./travis/docker_compile.sh
127
else
138

travis/doxygen.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
# Execute for GENIVI repository only. Exclude PR.
6-
if [ "$TRAVIS_OS_NAME" == "linux" -a "$TRAVIS_REPO_SLUG" == "GENIVI/CANdevStudio" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then
6+
if [ "$TRAVIS_OS_NAME" == "linux" -a "$TRAVIS_REPO_SLUG" == "GENIVI/CANdevStudio" -a "$TRAVIS_PULL_REQUEST" == "false" -a "$DOXYGEN" == "ON"]; then
77
cd "$TRAVIS_BUILD_DIR" || exit
88
chmod +x .travis_doxygen.sh
99
docker run \

0 commit comments

Comments
 (0)