Skip to content

Commit 0fd3e16

Browse files
committed
Problem: OSX build does not start first.
Solution: remove matrix and include build combination manually.
1 parent 1fc0675 commit 0fd3e16

File tree

1 file changed

+23
-13
lines changed

1 file changed

+23
-13
lines changed

.travis.yml

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,32 @@ addons:
1515
sources:
1616
- ubuntu-toolchain-r-test
1717

18-
env:
19-
matrix:
20-
- ZMQ_VERSION=4.2.5
21-
- ZMQ_VERSION=4.2.4
22-
2318
matrix:
2419
include:
2520
##########################################################
2621
# Clang on OSX
2722
# Travis takes longer to start OSX instances,
2823
# so leaving it first for the overall build to be faster.
2924
##########################################################
25+
3026
- os: osx
3127
osx_image: xcode9.1
3228
env:
3329
- 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
4244
- os: linux
4345
addons:
4446
apt:
@@ -48,6 +50,14 @@ matrix:
4850
- g++-7
4951
env:
5052
- 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
5161

5262
sudo: required
5363

0 commit comments

Comments
 (0)