summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-01-16 17:57:54 -0500
committerGitHub <noreply@github.com>2018-01-16 17:57:54 -0500
commit4dc989f0730845e74af9a4120841f363363046db (patch)
tree4e19d9a0d9115b0aef91e49a590c10d31e3bb35a
parent5f6e29831fa6255fc60fe29d060dd43570edde41 (diff)
parentaf9a4539b1eefaf3969c289a8b7cad296f2d44cb (diff)
Merge pull request #46 from FearlessTobi/patch-2
Implement Pull #3034 from Citra: Change build order to check clang-format first
-rw-r--r--.travis.yml16
1 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 2051d225c..9edfc0809 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,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
dist: trusty
@@ -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