8000 Travis: Define CC and CXX in yaml · joglosemarduino/ArduinoJson@cfd9246 · GitHub
[go: up one dir, main page]
Skip to content

Commit cfd9246

Browse files
bblanchonbblanchon
committed
Travis: Define CC and CXX in yaml
1 parent 27c08b7 commit cfd9246

File tree

2 files changed

+37
-67
lines changed

2 files changed

+37
-67
lines changed

‎.travis.yml

Lines changed: 35 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2,128 +2,105 @@ sudo: false
22
language: cpp
33
matrix:
44
include:
5-
- compiler: gcc
6-
addons:
5+
- addons:
76
apt:
87
sources: ['ubuntu-toolchain-r-test']
98
packages: ['g++-4.4']
10-
env: SCRIPT=cmake GCC=4.4
11-
- compiler: gcc
12-
addons:
9+
env: SCRIPT=cmake _CC=gcc-4.4 _CXX=g++-4.4
10+
- addons:
1311
apt:
1412
sources: ['ubuntu-toolchain-r-test']
1513
packages: ['g++-4.6']
16-
env: SCRIPT=cmake GCC=4.6
17-
- compiler: gcc
18-
addons:
14+
env: SCRIPT=cmake _CC=gcc-4.6 _CXX=g++-4.6
15+
- addons:
1916
apt:
2017
sources: ['ubuntu-toolchain-r-test']
2118
packages: ['g++-4.7']
22-
env: SCRIPT=cmake GCC=4.7
23-
- compiler: gcc
24-
addons:
19+
env: SCRIPT=cmake _CC=gcc-4.7 _CXX=g++-4.7
20+
- addons:
2521
apt:
2622
sources: ['ubuntu-toolchain-r-test']
2723
packages: ['g++-4.8']
28-
env: SCRIPT=cmake GCC=4.8 SANITIZE=address
29-
- compiler: gcc
30-
addons:
24+
env: SCRIPT=cmake _CC=gcc-4.8 _CXX=g++-4.8 SANITIZE=address
25+
- addons:
3126
apt:
3227
sources: ['ubuntu-toolchain-r-test']
3328
packages: ['g++-4.9']
34-
env: SCRIPT=cmake GCC=4.9 SANITIZE=leak
35-
- compiler: gcc
36-
addons:
29+
env: SCRIPT=cmake _CC=gcc-4.9 _CXX=g++-4.9 SANITIZE=leak
30+
- addons:
3731
apt:
3832
sources: ['ubuntu-toolchain-r-test']
3933
packages: ['g++-5']
40-
env: SCRIPT=cmake GCC=5 # SANITIZE=undefined
41-
- compiler: gcc
42-
addons:
34+
env: SCRIPT=cmake _CC=gcc-5 _CXX=g++-5 # SANITIZE=undefined
35+
- addons:
4336
apt:
4437
sources: ['ubuntu-toolchain-r-test']
4538
packages: ['g++-6']
46-
env: SCRIPT=cmake GCC=6
47-
- compiler: gcc
48-
addons:
39+
env: SCRIPT=cmake _CC=gcc-6 _CXX=g++-6
40+
- addons:
4941
apt:
5042
sources: ['ubuntu-toolchain-r-test']
5143
packages: ['g++-7']
52-
env: SCRIPT=cmake GCC=7
53-
- compiler: clang
54-
env: SCRIPT=cmake
55-
- compiler: clang
56-
addons:
44+
env: SCRIPT=cmake _CC=gcc-7 _CXX=g++-7
45+
- env: SCRIPT=cmake _CC=clang _CXX=clang++
46+
- addons:
5747
apt:
5848
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5']
5949
packages: ['clang-3.5']
60-
env: SCRIPT=cmake CLANG=3.5 SANITIZE=address
61-
- compiler: clang
62-
addons:
50+
env: SCRIPT=cmake _CC=clang-3.5 _CXX=clang++-3.5 SANITIZE=address
51+
- addons:
6352
apt:
6453
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.6']
6554
packages: ['clang-3.6']
66-
env: SCRIPT=cmake CLANG=3.6 SANITIZE=leak
67-
- compiler: clang
68-
addons:
55+
env: SCRIPT=cmake _CC=clang-3.6 _CXX=clang++-3.6 SANITIZE=leak
56+
- addons:
6957
apt:
7058
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.7']
7159
packages: ['clang-3.7']
72-
env: SCRIPT=cmake CLANG=3.7
73-
- compiler: clang
74-
addons:
60+
env: SCRIPT=cmake _CC=clang-3.7 _CXX=clang++-3.7
61+
- addons:
7562
apt:
7663
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.8']
7764
packages: ['clang-3.8']
78-
env: SCRIPT=cmake CLANG=3.8 SANITIZE=undefined
79-
- compiler: clang
80-
addons:
65+
env: SCRIPT=cmake _CC=clang-3.8 _CXX=clang++-3.8 SANITIZE=undefined
66+
- addons:
8167
apt:
8268
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-3.9']
8369
packages: ['clang-3.9']
84-
env: SCRIPT=cmake CLANG=3.9
85-
- compiler: clang< 6D4E /span>
86-
addons:
70+
env: SCRIPT=cmake _CC=clang-3.9 _CXX=clang++-3.9
71+
- addons:
8772
apt:
8873
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-4.0']
8974
packages: ['clang-4.0']
90-
env: SCRIPT=cmake CLANG=4.0
91-
- compiler: clang
92-
addons:
75+
env: SCRIPT=cmake _CC=clang-4.0 _CXX=clang++-4.0
76+
- addons:
9377
apt:
9478
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-5.0']
9579
packages: ['clang-5.0']
96-
env: SCRIPT=cmake CLANG=5.0
97-
- compiler: clang
98-
addons:
80+
env: SCRIPT=cmake _CC=clang-5.0 _CXX=clang++-5.0
81+
- addons:
9982
apt:
10083
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-6.0']
10184
packages: ['clang-6.0']
102-
env: SCRIPT=cmake CLANG=6.0
103-
- compiler: gcc
104-
env: SCRIPT=coverage
85+
env: SCRIPT=cmake _CC=clang-6.0 _CXX=clang++-6.0
86+
- env: SCRIPT=coverage
10587
- os: osx
10688
osx_image: xcode7.3
107-
compiler: clang
10889
env: SCRIPT=cmake
10990
- os: osx
11091
osx_image: xcode8.3
111-
compiler: clang
11292
env: SCRIPT=cmake
11393
- os: osx
11494
osx_image: xcode9.4
115-
compiler: clang
11695
env: SCRIPT=cmake
11796
- os: osx
11897
osx_image: xcode10
119-
compiler: clang
12098
env: SCRIPT=cmake SANITIZE=address
12199
- env: SCRIPT=arduino VERSION=1.6.7 BOARD=arduino:avr:uno
122100
- env: SCRIPT=arduino VERSION=1.8.2 BOARD=arduino:samd:mkr1000
123101
- env: SCRIPT=platformio BOARD=uno
124102
- env: SCRIPT=platformio BOARD=esp01
125-
- compiler: clang
126-
addons:
103+
- addons:
127104
apt:
128105
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-6.0']
129106
packages: ['clang-6.0','llvm-6.0']

‎scripts/travis/cmake.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
#!/bin/sh -ex
22

3-
if [ -n "$GCC" ]; then
4-
export CC="gcc-$GCC"
5-
export CXX="g++-$GCC"
6-
fi
7-
8-
if [ -n "$CLANG" ]; then
9-
export CC="clang-$CLANG"
10-
export CXX="clang++-$CLANG"
11-
fi
3+
export CC="$_CC"
4+
export CXX="$_CXX"
125

136
if [ -n "$SANITIZE" ]; then
147
export CXXFLAGS="-fsanitize=$SANITIZE"

0 commit comments

Comments
 (0)
0