diff options
| author | Ben Vanik <ben.vanik@gmail.com> | 2015-09-22 08:19:57 -0700 |
|---|---|---|
| committer | Ben Vanik <ben.vanik@gmail.com> | 2015-09-22 08:19:57 -0700 |
| commit | 2298fa8048b254631b3daab3ab9e81d88c54f883 (patch) | |
| tree | a1b8fe742c2597daf8aaa4a16c2a2da1c69e56b6 /.travis.yml | |
| parent | a47badd84f8d88f57a35709cfd0cbb5fe3a46c50 (diff) | |
Now that clang-3.8 is whitelisted on travis, try that.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index b4219a317..fc109d89f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,30 +12,20 @@ os: - linux # - osx -# TODO(benvanik): re-enable when clang-3.8 is whitelisted. -# https://github.com/travis-ci/apt-package-whitelist/issues/474 -#addons: -# apt: -# sources: -# - llvm-toolchain-precise -# packages: -# - clang-3.8 -# - clang-format-3.8 +sudo: false +addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise + packages: + - clang-3.8 + - clang-format-3.8 git: # We handle submodules ourselves in xenia-build setup. submodules: false -before_install: - - sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" - - gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /tmp/tmp.7QGyKksfYF --trustdb-name /etc/apt/trustdb.gpg --keyring /etc/apt/trusted.gpg --primary-keyring /etc/apt/trusted.gpg --keyring /etc/apt/trusted.gpg.d//apt.postgresql.org.gpg --keyserver hkp://keyserver.ubuntu.com:80/ --recv 60C317803A41BA51845E371A1E9377A2BA9EF27F - - sudo add-apt-repository "deb http://llvm.org/apt/precise/ llvm-toolchain-precise main" -y - - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - - - sudo apt-get -yq update - -install: - - sudo apt-get -yq --force-yes install clang-3.8 clang-format-3.8 - before_script: # Dump useful info. - $CXX --version |