From 7acc5c8f30f7b896dc666cf805fae24642ccb781 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 3 Dec 2016 01:10:07 -0800 Subject: [PATCH] Travis: Use a stable version of clang-format --- .travis-build.sh | 2 +- .travis-deps.sh | 7 +++++++ .travis.yml | 4 +--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis-build.sh b/.travis-build.sh index 3310bacc5c..df6e236b69 100755 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -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 diff --git a/.travis-deps.sh b/.travis-deps.sh index 9fd21cc570..1404fe19f9 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh @@ -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 diff --git a/.travis.yml b/.travis.yml index a9e7aadd22..cc34e039ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: cpp matrix: include: - os: linux - sudo: true + sudo: required dist: trusty - os: osx sudo: false @@ -17,7 +17,6 @@ addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise packages: - gcc-6 - g++-6 @@ -25,7 +24,6 @@ addons: - libqt5opengl5-dev - xorg-dev - lib32stdc++6 # For CMake - - clang-format-4.0 cache: directories: