diff options
| author | Evan Nemerson <evan@nemerson.com> | 2016-07-22 19:14:29 -0700 |
|---|---|---|
| committer | Evan Nemerson <evan@nemerson.com> | 2016-07-26 08:53:26 -0700 |
| commit | 1d15c95363bbb23a8bf595a073f8a48116dea27e (patch) | |
| tree | f55a4f9e79c71eace7f987bd44f068ab849bc71f /.travis.yml | |
| parent | 37be4e37ce355a503994586f95f80be0328020e6 (diff) | |
| download | brotli-1d15c95363bbb23a8bf595a073f8a48116dea27e.zip brotli-1d15c95363bbb23a8bf595a073f8a48116dea27e.tar.gz brotli-1d15c95363bbb23a8bf595a073f8a48116dea27e.tar.bz2 | |
travis: enable clang builds now that the LLVM repos are back up
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 81 |
1 files changed, 36 insertions, 45 deletions
diff --git a/.travis.yml b/.travis.yml index 75f1a5a..c80123d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,53 +79,44 @@ matrix: - g++-4.4 ### - ## clang 3.5-3.8 are currently disabled. LLVM's repo was down for - ## a while, so Travis disabled the repository. LLVM's apt repos - ## are back up, but Travis has yet to re-enable them. For - ## details, see - ## https://github.com/travis-ci/apt-source-whitelist/issues/279 - ### - # - os: linux - # env: BUILD_SYSTEM=cmake C_COMPILER=clang-3.8 CXX_COMPILER=clang++-3.8 - # addons: - # apt: - # sources: - # - llvm-toolchain-precise-3.8 - # packages: - # - clang-3.8 - # - 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 - # packages: - # - clang-3.7 - # - clang-3.7 - # - os: linux - # env: BUILD_SYSTEM=cmake C_COMPILER=clang-3.6 CXX_COMPILER=clang++-3.6 - # addons: - # apt: - # sources: - # - llvm-toolchain-precise-3.6 - # packages: - # - clang-3.6 - # - clang-3.6 - # - os: linux - # env: BUILD_SYSTEM=cmake C_COMPILER=clang-3.5 CXX_COMPILER=clang++-3.5 - # addons: - # apt: - # sources: - # - llvm-toolchain-precise-3.5 - # packages: - # - clang-3.5 - # - clang-3.5 - ### - ## clang/clang++ on 12.04 is 3.4 + ## clang on Linux ### - os: linux - env: BUILD_SYSTEM=cmake C_COMPILER=clang CXX_COMPILER=clang++ + 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 + addons: + apt: + sources: + - llvm-toolchain-precise-3.6 + - ubuntu-toolchain-r-test + packages: + - clang-3.6 + - os: linux + env: BUILD_SYSTEM=cmake C_COMPILER=clang-3.5 CXX_COMPILER=clang++-3.5 + addons: + apt: + sources: + - llvm-toolchain-precise-3.5 + - ubuntu-toolchain-r-test + packages: + - clang-3.5 ### ## Python build on Linux |