diff options
| author | Eugene Kliuchnikov <eustas@google.com> | 2017-11-30 20:54:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-30 20:54:04 +0100 |
| commit | 2d6b298e117576dc3e4fa41f53ba57400bf7beed (patch) | |
| tree | 1be19f4d1c762747b55c41500ffb049248867ec5 | |
| parent | c8c8389ed3101279b79d93210b33f63dca8af74c (diff) | |
| download | brotli-2d6b298e117576dc3e4fa41f53ba57400bf7beed.zip brotli-2d6b298e117576dc3e4fa41f53ba57400bf7beed.tar.gz brotli-2d6b298e117576dc3e4fa41f53ba57400bf7beed.tar.bz2 | |
Update Travis matrix (#626)
* Use Clang-5.0
* Disable unholy ASAN leak detector (to unbreak build)
* Reduce build matrix and use faster env, where compiler version is not important
* Add autotools build to Travis matrix
| -rw-r--r-- | .travis.yml | 65 | ||||
| -rwxr-xr-x | scripts/.travis.sh | 3 |
2 files changed, 32 insertions, 36 deletions
diff --git a/.travis.yml b/.travis.yml index 4d7a16f..78495d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,16 +18,20 @@ matrix: - gcc-7 - g++-7 - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=gcc-6 CXX_COMPILER=g++-6 + env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.4 CXX_COMPILER=g++-4.4 addons: apt: sources: - ubuntu-toolchain-r-test packages: - - gcc-6 - - g++-6 + - gcc-4.4 + - g++-4.4 + + ### + ## Test that Autotools build works. + ### - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=gcc-5 CXX_COMPILER=g++-5 + env: BUILD_SYSTEM=autotools C_COMPILER=gcc-5 CXX_COMPILER=g++-5 addons: apt: sources: @@ -35,41 +39,32 @@ matrix: packages: - gcc-5 - g++-5 - - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.4 CXX_COMPILER=g++-4.4 - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - gcc-4.4 - - g++-4.4 ### ## Test that fuzzer is compiling / working. ### - os: linux - env: BUILD_SYSTEM=fuzz C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 + env: BUILD_SYSTEM=fuzz C_COMPILER=clang-5.0 CXX_COMPILER=clang++-5.0 ASAN_OPTIONS=detect_leaks=0 addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-4.0 + - llvm-toolchain-trusty-5.0 packages: - - clang-4.0 + - clang-5.0 ### ## clang on Linux ### - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 + env: BUILD_SYSTEM=cmake C_COMPILER=clang-5.0 CXX_COMPILER=clang++-5.0 addons: apt: sources: - - llvm-toolchain-trusty-4.0 + - llvm-toolchain-trusty-5.0 - ubuntu-toolchain-r-test packages: - - clang-4.0 + - clang-5.0 - os: linux env: BUILD_SYSTEM=cmake C_COMPILER=clang-3.5 CXX_COMPILER=clang++-3.5 addons: @@ -92,25 +87,25 @@ matrix: - os: linux language: python python: 2.7 - env: BUILD_SYSTEM=python C_COMPILER=gcc-6 CXX_COMPILER=g++-6 + env: BUILD_SYSTEM=python C_COMPILER=gcc-5 CXX_COMPILER=g++-5 addons: apt: sources: - ubuntu-toolchain-r-test packages: - - gcc-6 - - g++-6 + - gcc-5 + - g++-5 - os: linux language: python python: 3.6 - env: BUILD_SYSTEM=python C_COMPILER=gcc-6 CXX_COMPILER=g++-6 + env: BUILD_SYSTEM=python C_COMPILER=gcc-5 CXX_COMPILER=g++-5 addons: apt: sources: - ubuntu-toolchain-r-test packages: - - gcc-6 - - g++-6 + - gcc-5 + - g++-5 ### ## CMake on OS X @@ -122,8 +117,6 @@ matrix: - 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 osx_image: beta-xcode6.2 env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.4 CXX_COMPILER=g++-4.4 @@ -137,32 +130,32 @@ matrix: ## Sanitizers ### - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 SANITIZER=address + env: BUILD_SYSTEM=cmake C_COMPILER=clang-5.0 CXX_COMPILER=clang++-5.0 SANITIZER=address ASAN_OPTIONS=detect_leaks=0 addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-4.0 + - llvm-toolchain-trusty-5.0 packages: - - clang-4.0 + - clang-5.0 - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 SANITIZER=thread + env: BUILD_SYSTEM=cmake C_COMPILER=clang-5.0 CXX_COMPILER=clang++-5.0 SANITIZER=thread addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-4.0 + - llvm-toolchain-trusty-5.0 packages: - - clang-4.0 + - clang-5.0 - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=clang-4.0 CXX_COMPILER=clang++-4.0 SANITIZER=undefined CFLAGS="-fno-sanitize-recover=undefined,integer" + env: BUILD_SYSTEM=cmake C_COMPILER=clang-5.0 CXX_COMPILER=clang++-5.0 SANITIZER=undefined CFLAGS="-fno-sanitize-recover=undefined,integer" addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-4.0 + - llvm-toolchain-trusty-5.0 packages: - - clang-4.0 + - clang-5.0 - os: linux env: BUILD_SYSTEM=maven diff --git a/scripts/.travis.sh b/scripts/.travis.sh index 9ddfa1b..18cd7b0 100755 --- a/scripts/.travis.sh +++ b/scripts/.travis.sh @@ -51,6 +51,9 @@ case "$1" in cd java/org/brotli mvn install && cd integration && mvn verify ;; + "autotools") + ./bootstrap && ./configure && make + ;; "fuzz") ./c/fuzz/test_fuzzer.sh ;; |