Skip to content

Commit 71533b1

Browse files
Another try at Travis...
1 parent 23c179e commit 71533b1

File tree

1 file changed

+9
-47
lines changed

1 file changed

+9
-47
lines changed

.travis.yml

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,56 +6,16 @@ git:
66
depth: 1
77
submodules: false
88

9-
# From https://docs.travis-ci.com/user/languages/cpp/ - to get less ancient GCC/G++
10-
matrix:
11-
include:
12-
# works on Precise and Trusty
13-
- os: linux
14-
addons:
15-
apt:
16-
sources:
17-
- ubuntu-toolchain-r-test
18-
packages:
19-
- g++-4.9
20-
env:
21-
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
22-
23-
# works on Precise and Trusty
24-
- os: linux
25-
addons:
26-
apt:
27-
sources:
28-
- ubuntu-toolchain-r-test
29-
packages:
30-
- g++-5
31-
env:
32-
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
33-
34-
# works on Precise and Trusty
35-
- os: linux
36-
addons:
37-
apt:
38-
sources:
39-
- ubuntu-toolchain-r-test
40-
packages:
41-
- g++-6
42-
env:
43-
- MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
44-
45-
# works on Precise and Trusty
46-
- os: linux
47-
addons:
48-
apt:
49-
sources:
50-
- ubuntu-toolchain-r-test
51-
packages:
52-
- g++-7
53-
env:
54-
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
9+
addons:
10+
apt:
11+
sources:
12+
- ubuntu-toolchain-r-test
13+
packages:
14+
- g++-7
15+
- gcc-7
5516

5617
before_install:
5718
- git submodule update --init # no recursive update
58-
- eval "${MATRIX_EVAL}"
5919

6020
cache:
6121
directories:
@@ -128,6 +88,7 @@ jobs:
12888
stage: build
12989
script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh
13090
install: sudo apt-get install valgrind lcov
91+
env: CC=gcc-7 CXX=g++-7
13192

13293
- name: "Docs"
13394
stage: build
@@ -144,6 +105,7 @@ jobs:
144105
- name: "Mock trivial test"
145106
stage: build
146107
script: $TRAVIS_BUILD_DIR/tests/buildm.sh
108+
env: CC=gcc-7 CXX=g++-7
147109

148110
- name: "Boards"
149111
stage: build

0 commit comments

Comments
 (0)