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:
bunnei 2018-01-16 17:57:54 -05:00 committed by GitHub
commit 4dc989f073
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,14 @@
language: cpp language: cpp
matrix: matrix:
include: include:
- os: linux
env: NAME="clang-format"
dist: trusty
addons:
apt:
packages:
- clang-format-3.9
script: "./.travis/clang-format/script.sh"
- os: linux - os: linux
env: NAME="linux build" env: NAME="linux build"
sudo: required sudo: required
@ -20,14 +28,6 @@ matrix:
install: "./.travis/macos/deps.sh" install: "./.travis/macos/deps.sh"
script: "./.travis/macos/build.sh" script: "./.travis/macos/build.sh"
after_success: "./.travis/macos/upload.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: deploy:
provider: releases provider: releases