File tree Expand file tree Collapse file tree 1 file changed +23
-13
lines changed Expand file tree Collapse file tree 1 file changed +23
-13
lines changed Original file line number Diff line number Diff line change @@ -15,30 +15,32 @@ addons:
15
15
sources :
16
16
- ubuntu-toolchain-r-test
17
17
18
- env :
19
- matrix :
20
- - ZMQ_VERSION=4.2.5
21
- - ZMQ_VERSION=4.2.4
22
-
23
18
matrix :
24
19
include :
25
20
# #########################################################
26
21
# Clang on OSX
27
22
# Travis takes longer to start OSX instances,
28
23
# so leaving it first for the overall build to be faster.
29
24
# #########################################################
25
+
30
26
- os : osx
31
27
osx_image : xcode9.1
32
28
env :
33
29
- MATRIX_EVAL="brew install cmake" ZMQ_VERSION=4.2.5 DRAFT=1
34
- # - env: BUILD_TYPE=cmake DO_CLANG_FORMAT_CHECK=1 CLANG_FORMAT=/usr/local/clang-5.0.0/bin/clang-format
35
- # os: linux
36
- # addons:
37
- # apt:
38
- # sources:
39
- # - llvm-toolchain-trusty-5.0
40
- # packages:
41
- # - clang-5.0
30
+
31
+ # #########################################################
32
+ # GCC on Linux
33
+ # #########################################################
34
+
35
+ # GCC default, draft disabled, latest libzmq
36
+ - os : linux
37
+ env : ZMQ_VERSION=4.2.5
38
+
39
+ # GCC default, draft disabled, older libzmq
40
+ - os : linux
41
+ env : ZMQ_VERSION=4.2.4
42
+
43
+ # GCC 7, draft enabled, latest libzmq
42
44
- os : linux
43
45
addons :
44
46
apt :
@@ -48,6 +50,14 @@ matrix:
48
50
- g++-7
49
51
env :
50
52
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" ZMQ_VERSION=4.2.5 DRAFT=1
53
+ # - env: BUILD_TYPE=cmake DO_CLANG_FORMAT_CHECK=1 CLANG_FORMAT=/usr/local/clang-5.0.0/bin/clang-format
54
+ # os: linux
55
+ # addons:
56
+ # apt:
57
+ # sources:
58
+ # - llvm-toolchain-trusty-5.0
59
+ # packages:
60
+ # - clang-5.0
51
61
52
62
sudo : required
53
63
You can’t perform that action at this time.
0 commit comments