Travis: Use a stable version of clang-format
This commit is contained in:
		
							parent
							
								
									018191c1f0
								
							
						
					
					
						commit
						7acc5c8f30
					
				| @ -12,7 +12,7 @@ fi | |||||||
| # Only run clang-format on Linux because we don't have 4.0 on OS X images | # Only run clang-format on Linux because we don't have 4.0 on OS X images | ||||||
| if [ "$TRAVIS_OS_NAME" = "linux" ]; then | if [ "$TRAVIS_OS_NAME" = "linux" ]; then | ||||||
|     # Default clang-format points to default 3.5 version one |     # 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 |     $CLANG_FORMAT --version | ||||||
| 
 | 
 | ||||||
|     if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then |     if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then | ||||||
|  | |||||||
| @ -27,6 +27,13 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then | |||||||
|         echo "Using cached SDL2" |         echo "Using cached SDL2" | ||||||
|     fi |     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 | elif [ "$TRAVIS_OS_NAME" = "osx" ]; then | ||||||
|     brew update |     brew update | ||||||
|     brew install qt5 sdl2 dylibbundler |     brew install qt5 sdl2 dylibbundler | ||||||
|  | |||||||
| @ -3,7 +3,7 @@ language: cpp | |||||||
| matrix: | matrix: | ||||||
|   include: |   include: | ||||||
|     - os: linux |     - os: linux | ||||||
|       sudo: true |       sudo: required | ||||||
|       dist: trusty |       dist: trusty | ||||||
|     - os: osx |     - os: osx | ||||||
|       sudo: false |       sudo: false | ||||||
| @ -17,7 +17,6 @@ addons: | |||||||
|   apt: |   apt: | ||||||
|     sources: |     sources: | ||||||
|       - ubuntu-toolchain-r-test |       - ubuntu-toolchain-r-test | ||||||
|       - llvm-toolchain-precise |  | ||||||
|     packages: |     packages: | ||||||
|       - gcc-6 |       - gcc-6 | ||||||
|       - g++-6 |       - g++-6 | ||||||
| @ -25,7 +24,6 @@ addons: | |||||||
|       - libqt5opengl5-dev |       - libqt5opengl5-dev | ||||||
|       - xorg-dev |       - xorg-dev | ||||||
|       - lib32stdc++6 # For CMake |       - lib32stdc++6 # For CMake | ||||||
|       - clang-format-4.0 |  | ||||||
| 
 | 
 | ||||||
| cache: | cache: | ||||||
|   directories: |   directories: | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Yuri Kunde Schlesner
						Yuri Kunde Schlesner