Now that clang-3.8 is whitelisted on travis, try that.

This commit is contained in:
Ben Vanik 2015-09-22 08:19:57 -07:00
parent a47badd84f
commit 2298fa8048
1 changed files with 9 additions and 19 deletions

View File

@ -12,30 +12,20 @@ os:
- linux - linux
# - osx # - osx
# TODO(benvanik): re-enable when clang-3.8 is whitelisted. sudo: false
# https://github.com/travis-ci/apt-package-whitelist/issues/474 addons:
#addons: apt:
# apt: sources:
# sources: - ubuntu-toolchain-r-test
# - llvm-toolchain-precise - llvm-toolchain-precise
# packages: packages:
# - clang-3.8 - clang-3.8
# - clang-format-3.8 - clang-format-3.8
git: git:
# We handle submodules ourselves in xenia-build setup. # We handle submodules ourselves in xenia-build setup.
submodules: false 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: before_script:
# Dump useful info. # Dump useful info.
- $CXX --version - $CXX --version