travis: macOS is optional

This commit is contained in:
Jacob Dufault 2018-01-18 10:24:59 -08:00
parent 3c23ed8047
commit f93eaa74a2

View File

@ -9,7 +9,7 @@ env:
# Default --recursive (rapidjson/thirdparty/gtest) is unnecessary # Default --recursive (rapidjson/thirdparty/gtest) is unnecessary
git: git:
submodules: false submodules: false
depth: 3 depth: 1
before_install: before_install:
- git submodule update --init - git submodule update --init
@ -19,11 +19,6 @@ addons:
sources: &apt_sources sources: &apt_sources
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.5 - llvm-toolchain-precise-3.5
#- llvm-toolchain-precise-3.6
#- llvm-toolchain-precise-3.7
#- llvm-toolchain-precise-3.8
#- llvm-toolchain-trusty-3.9
#- llvm-toolchain-trusty-4.0
- llvm-toolchain-trusty-5.0 - llvm-toolchain-trusty-5.0
compiler: clang compiler: clang
@ -44,13 +39,6 @@ matrix:
packages: ["g++-5"] packages: ["g++-5"]
sources: *apt_sources sources: *apt_sources
# - env: COMPILER=g++-6
# compiler: gcc
# addons: &gcc6
# apt:
# packages: ["g++-6"]
# sources: *apt_sources
- env: COMPILER=g++-7 - env: COMPILER=g++-7
compiler: gcc compiler: gcc
addons: &gcc7 addons: &gcc7
@ -64,91 +52,37 @@ matrix:
packages: ["clang-3.5", "g++-7"] packages: ["clang-3.5", "g++-7"]
sources: *apt_sources sources: *apt_sources
# - env: COMPILER=clang++-3.6
# addons: &clang36
# apt:
# packages: ["clang-3.6", "g++-7"]
# sources: *apt_sources
# - env: COMPILER=clang++-3.7
# addons: &clang37
# apt:
# packages: ["clang-3.7", "g++-7"]
# sources: *apt_sources
# - env: COMPILER=clang++-3.8
# addons: &clang38
# apt:
# packages: ["clang-3.8", "g++-7"]
# sources: *apt_sources
# - env: COMPILER=clang++-3.9
# addons: &clang39
# apt:
# packages: ["clang-3.9", "g++-7"]
# sources: *apt_sources
# - env: COMPILER=clang++-4.0
# addons: &clang40
# apt:
# packages: ["clang-4.0", "g++-7"]
# sources: *apt_sources
- env: COMPILER=clang++-5.0 - env: COMPILER=clang++-5.0
addons: &clang50 addons: &clang50
apt: apt:
packages: ["clang-5.0", "g++-7"] packages: ["clang-5.0", "g++-7"]
sources: *apt_sources sources: *apt_sources
# - env: COMPILER=clang++
# osx_image: xcode6.4
# os: osx
# - env: COMPILER=clang++
# osx_image: xcode7.3
# os: osx
# - env: COMPILER=clang++
# osx_image: xcode8
# os: osx
# - env: COMPILER=clang++
# osx_image: xcode8.1
# os: osx
# - env: COMPILER=clang++
# osx_image: xcode8.2
# os: osx
# - env: COMPILER=clang++
# osx_image: xcode8.3
# os: osx
# - env: COMPILER=clang++
# osx_image: xcode9
# os: osx
- env: COMPILER=clang++ - env: COMPILER=clang++
osx_image: xcode9.1 osx_image: xcode9.1
os: osx os: osx
# - env: COMPILER=g++-5
# compiler: gcc
# osx_image: xcode9.1
# os: osx
# - env: COMPILER=g++-6
# compiler: gcc
# osx_image: xcode9.1
# os: osx
- env: COMPILER=g++-7 - env: COMPILER=g++-7
compiler: gcc compiler: gcc
osx_image: xcode9.1 osx_image: xcode9.1
os: osx os: osx
allow_failures: allow_failures:
# macOS takes too long.
- env: COMPILER=clang++
osx_image: xcode9.1
os: osx
- env: COMPILER=g++-7
compiler: gcc
osx_image: xcode9.1
os: osx
# gcc builds that should be fixed at some point
- env: COMPILER=g++-5 - env: COMPILER=g++-5
compiler: gcc compiler: gcc