Merge pull request #46 from FearlessTobi/patch-2
Implement Pull #3034 from Citra: Change build order to check clang-format first
This commit is contained in:
		
						commit
						4dc989f073
					
				
							
								
								
									
										16
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								.travis.yml
									
									
									
									
									
								
							@ -1,6 +1,14 @@
 | 
			
		||||
language: cpp
 | 
			
		||||
matrix:
 | 
			
		||||
  include:
 | 
			
		||||
    - os: linux
 | 
			
		||||
      env: NAME="clang-format"
 | 
			
		||||
      dist: trusty
 | 
			
		||||
      addons:
 | 
			
		||||
        apt:
 | 
			
		||||
          packages:
 | 
			
		||||
            - clang-format-3.9
 | 
			
		||||
      script: "./.travis/clang-format/script.sh"
 | 
			
		||||
    - os: linux
 | 
			
		||||
      env: NAME="linux build"
 | 
			
		||||
      sudo: required
 | 
			
		||||
@ -20,14 +28,6 @@ matrix:
 | 
			
		||||
      install: "./.travis/macos/deps.sh"
 | 
			
		||||
      script: "./.travis/macos/build.sh"
 | 
			
		||||
      after_success: "./.travis/macos/upload.sh"
 | 
			
		||||
    - os: linux
 | 
			
		||||
      env: NAME="clang-format"
 | 
			
		||||
      dist: trusty
 | 
			
		||||
      addons:
 | 
			
		||||
        apt:
 | 
			
		||||
          packages:
 | 
			
		||||
            - clang-format-3.9
 | 
			
		||||
      script: "./.travis/clang-format/script.sh"
 | 
			
		||||
 | 
			
		||||
deploy:
 | 
			
		||||
  provider: releases
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user