encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Travis after LLVM APT repo change 

After LLVM 6.0 was branched, the LLVM APT repositories changed so that
clang-format-7 is in the "latest" repo instead of 6.0. We cannot use
the LLVM-6.0 repo in Travis yet because it isn't in the repo whitelist.
Update travis.yml to use clang-format-7
This commit is contained in:
Corentin Wallez 2018-01-29 11:25:51 -05:00 committed by Corentin Wallez
parent 49588b0b8d
commit 32fbde25ec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -22,7 +22,7 @@ addons:
sources: sources:
# PPA for clang 5.0 # PPA for clang 5.0
- llvm-toolchain-trusty-5.0 - llvm-toolchain-trusty-5.0
# PPA for clang-format 6.0 # PPA for clang-format 7
- llvm-toolchain-trusty - llvm-toolchain-trusty
# PPA for a more recen libstdc++ # PPA for a more recen libstdc++
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
@ -38,7 +38,7 @@ addons:
# Required dependency for GLFW on Linux # Required dependency for GLFW on Linux
- xorg-dev - xorg-dev
# Format using the latest and greatest # Format using the latest and greatest
- clang-format-6.0 - clang-format-7
before_install: before_install:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
@ -70,4 +70,4 @@ script:
- cd .. - cd ..
# Lint # Lint
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./scripts/travis_lint_format.sh clang-format-6.0; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./scripts/travis_lint_format.sh clang-format-7; fi