diff options
author | Eugene Kliuchnikov <eustas@google.com> | 2017-09-18 13:52:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-18 13:52:53 +0200 |
commit | 87b43eb61b6c58fc60d9da871e8b55c6eb68987d (patch) | |
tree | 414605bc61f722c3c5162d197302cdbadab0c712 | |
parent | 6b1d0ab53da7e2f917b4340676b39c856251f972 (diff) | |
download | brotli-87b43eb61b6c58fc60d9da871e8b55c6eb68987d.zip brotli-87b43eb61b6c58fc60d9da871e8b55c6eb68987d.tar.gz brotli-87b43eb61b6c58fc60d9da871e8b55c6eb68987d.tar.bz2 |
Reduce / update travis build matrix. (#598)
-rw-r--r-- | .travis.yml | 133 |
1 files changed, 24 insertions, 109 deletions
diff --git a/.travis.yml b/.travis.yml index 3cbb379..95589a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,68 +9,32 @@ matrix: ## Linux builds using various versions of GCC. ### - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=gcc-6 CXX_COMPILER=g++-6 - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - gcc-6 - - g++-6 - - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=gcc-5 CXX_COMPILER=g++-5 + env: BUILD_SYSTEM=cmake C_COMPILER=gcc-7 CXX_COMPILER=g++-7 addons: apt: sources: - ubuntu-toolchain-r-test packages: - - gcc-5 - - g++-5 + - gcc-7 + - g++-7 - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.9 CXX_COMPILER=g++-4.9 - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - gcc-4.9 - - g++-4.9 - - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.8 CXX_COMPILER=g++-4.8 - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - gcc-4.8 - - g++-4.8 - - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.7 CXX_COMPILER=g++-4.7 + env: BUILD_SYSTEM=cmake C_COMPILER=gcc-6 CXX_COMPILER=g++-6 addons: apt: sources: - ubuntu-toolchain-r-test packages: - - gcc-4.7 - - g++-4.7 + - gcc-6 + - g++-6 - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.6 CXX_COMPILER=g++-4.6 + env: BUILD_SYSTEM=cmake C_COMPILER=gcc-5 CXX_COMPILER=g++-5 addons: apt: sources: - ubuntu-toolchain-r-test packages: - - gcc-4.6 - - g++-4.6 - # - os: linux - # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.5 CXX_COMPILER=g++-4.5 - # addons: - # apt: - # sources: - # - ubuntu-toolchain-r-test - # packages: - # - gcc-4.5 - # - g++-4.5 + - gcc-5 + - g++-5 - os: linux env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.4 CXX_COMPILER=g++-4.4 addons: @@ -85,38 +49,20 @@ matrix: ## clang on Linux ### - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=clang-3.8 CXX_COMPILER=clang++-3.8 - addons: - apt: - sources: - - llvm-toolchain-precise-3.8 - - ubuntu-toolchain-r-test - packages: - - clang-3.8 - - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=clang-3.7 CXX_COMPILER=clang++-3.7 - addons: - apt: - sources: - - llvm-toolchain-precise-3.7 - - ubuntu-toolchain-r-test - packages: - - clang-3.7 - - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=clang-3.6 CXX_COMPILER=clang++-3.6 + env: BUILD_SYSTEM=cmake C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 addons: apt: sources: - - llvm-toolchain-precise-3.6 + - llvm-toolchain-trusty-4.0 - ubuntu-toolchain-r-test packages: - - clang-3.6 + - clang-4.0 - os: linux env: BUILD_SYSTEM=cmake C_COMPILER=clang-3.5 CXX_COMPILER=clang++-3.5 addons: apt: sources: - - llvm-toolchain-precise-3.5 + - llvm-toolchain-trusty-3.5 - ubuntu-toolchain-r-test packages: - clang-3.5 @@ -160,20 +106,10 @@ matrix: ## all since we already test all these versions of GCC on Linux. ## We'll just test 4.4 and the most recent version. ### - # - os: osx - # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-6 CXX_COMPILER=g++-6 + - os: osx + env: BUILD_SYSTEM=cmake C_COMPILER=gcc-6 CXX_COMPILER=g++-6 - os: osx env: BUILD_SYSTEM=cmake C_COMPILER=gcc-5 CXX_COMPILER=g++-5 - # - os: osx - # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.9 CXX_COMPILER=g++-4.9 - # - os: osx - # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.8 CXX_COMPILER=g++-4.8 - # - os: osx - # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.7 CXX_COMPILER=g++-4.7 - # - os: osx - # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.6 CXX_COMPILER=g++-4.6 - # - os: osx - # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.5 CXX_COMPILER=g++-4.5 - os: osx osx_image: beta-xcode6.2 env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.4 CXX_COMPILER=g++-4.4 @@ -188,59 +124,38 @@ matrix: ## Sanitizers ### - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=clang-3.8 CXX_COMPILER=clang++-3.8 SANITIZER=address + env: BUILD_SYSTEM=cmake C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 SANITIZER=address addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.8 + - llvm-toolchain-trusty-4.0 packages: - - clang-3.8 + - clang-4.0 - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=clang-3.8 CXX_COMPILER=clang++-3.8 SANITIZER=thread + env: BUILD_SYSTEM=cmake C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 SANITIZER=thread addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.8 + - llvm-toolchain-trusty-4.0 packages: - - clang-3.8 - - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=clang-3.8 CXX_COMPILER=clang++-3.8 SANITIZER=undefined CFLAGS="-fno-sanitize-recover=undefined,integer" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.8 - packages: - - clang-3.8 - - ### - ## mingw - ### + - clang-4.0 - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=x86_64-w64-mingw32-gcc CXX_COMPILER=x86_64-w64-mingw32-g++ RC_COMPILER=x86_64-w64-mingw32-windres CROSS_COMPILE=yes + env: BUILD_SYSTEM=cmake C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 SANITIZER=undefined CFLAGS="-fno-sanitize-recover=undefined,integer" addons: apt: sources: - ubuntu-toolchain-r-test - - george-edison55-precise-backports + - llvm-toolchain-trusty-4.0 packages: - - binutils-mingw-w64-x86-64 - - g++-mingw-w64-x86-64 - - gcc-mingw-w64-x86-64 - - binutils-mingw-w64-x86-64 - - wine - # Because 2.8.6 passes -rdynamic to the linker, which breaks the build. - - cmake - - cmake-data + - clang-4.0 - os: linux env: BUILD_SYSTEM=maven language: java - os: linux - dist: trusty sudo: required language: java env: BUILD_SYSTEM=bazel |