Merge pull request #4129 from ccawley2011/clang-format-docker
travis: Use Docker for clang-format target
This commit is contained in:
		
							
								
								
									
										12
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								.travis.yml
									
									
									
									
									
								
							| @@ -3,15 +3,11 @@ matrix: | ||||
|   include: | ||||
|     - os: linux | ||||
|       env: NAME="clang-format" | ||||
|       sudo: required | ||||
|       dist: trusty | ||||
|       addons: | ||||
|         apt: | ||||
|           sources: | ||||
|             - llvm-toolchain-trusty-6.0 | ||||
|             - ubuntu-toolchain-r-test | ||||
|           packages: | ||||
|             - clang-format-6.0 | ||||
|       script: "./.travis/clang-format/script.sh" | ||||
|       services: docker | ||||
|       install: "./.travis/clang-format/deps.sh" | ||||
|       script: "./.travis/clang-format/build.sh" | ||||
|     - os: linux | ||||
|       env: NAME="linux build" | ||||
|       sudo: required | ||||
|   | ||||
							
								
								
									
										3
									
								
								.travis/clang-format/build.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										3
									
								
								.travis/clang-format/build.sh
									
									
									
									
									
										Executable file
									
								
							| @@ -0,0 +1,3 @@ | ||||
| #!/bin/bash -ex | ||||
| mkdir -p "$HOME/.ccache" | ||||
| docker run --env-file .travis/common/travis-ci.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-clang-format /bin/bash -ex /citra/.travis/clang-format/docker.sh | ||||
							
								
								
									
										3
									
								
								.travis/clang-format/deps.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										3
									
								
								.travis/clang-format/deps.sh
									
									
									
									
									
										Executable file
									
								
							| @@ -0,0 +1,3 @@ | ||||
| #!/bin/sh -ex | ||||
|  | ||||
| docker pull citraemu/build-environments:linux-clang-format | ||||
							
								
								
									
										5
									
								
								.travis/clang-format/docker.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										5
									
								
								.travis/clang-format/docker.sh
									
									
									
									
									
										Executable file
									
								
							| @@ -0,0 +1,5 @@ | ||||
| #!/bin/bash -ex | ||||
|  | ||||
| # Run clang-format | ||||
| cd /citra | ||||
| ./.travis/clang-format/script.sh | ||||
| @@ -6,6 +6,8 @@ TRAVIS_BRANCH | ||||
| TRAVIS_BUILD_ID | ||||
| TRAVIS_BUILD_NUMBER | ||||
| TRAVIS_COMMIT | ||||
| TRAVIS_COMMIT_RANGE | ||||
| TRAVIS_EVENT_TYPE | ||||
| TRAVIS_JOB_ID | ||||
| TRAVIS_JOB_NUMBER | ||||
| TRAVIS_REPO_SLUG | ||||
|   | ||||
		Reference in New Issue
	
	Block a user