Permalink
Browse files

Travis: Use a stable version of clang-format

  • Loading branch information...
1 parent 018191c commit 7acc5c8f30f7b896dc666cf805fae24642ccb781 @yuriks yuriks committed Dec 3, 2016
Showing with 9 additions and 4 deletions.
  1. +1 −1 .travis-build.sh
  2. +7 −0 .travis-deps.sh
  3. +1 −3 .travis.yml
View
@@ -12,7 +12,7 @@ fi
# Only run clang-format on Linux because we don't have 4.0 on OS X images
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
# Default clang-format points to default 3.5 version one
- CLANG_FORMAT=clang-format-4.0
+ CLANG_FORMAT=clang-format-3.9
$CLANG_FORMAT --version
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
View
@@ -27,6 +27,13 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
echo "Using cached SDL2"
fi
+ export DEBIAN_FRONTEND=noninteractive
+ # Amazing placebo security
+ curl http://apt.llvm.org/llvm-snapshot.gpg.key | sudo -E apt-key add -
+ sudo -E add-apt-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.9 main"
+ sudo -E apt-get -yq update
+ sudo -E apt-get -yq install clang-format-3.9
+
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
brew update
brew install qt5 sdl2 dylibbundler
View
@@ -3,7 +3,7 @@ language: cpp
matrix:
include:
- os: linux
- sudo: true
+ sudo: required
dist: trusty
- os: osx
sudo: false
@@ -17,15 +17,13 @@ addons:
apt:
sources:
- ubuntu-toolchain-r-test
- - llvm-toolchain-precise
packages:
- gcc-6
- g++-6
- qt5-default
- libqt5opengl5-dev
- xorg-dev
- lib32stdc++6 # For CMake
- - clang-format-4.0
cache:
directories:

0 comments on commit 7acc5c8

Please sign in to comment.