summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorJames Rowe <jroweboy@gmail.com>2017-10-10 01:27:46 +0200
committerGitHub <noreply@github.com>2017-10-10 01:27:46 +0200
commitd15e15bd058f93f1600c86ad8de7482740724f3f (patch)
tree3280c1d616bfb161d89906c29f87dfa7e43a3b76 /.travis.yml
parentMerge pull request #3002 from Dragios/nwm-cmdhdr-fix (diff)
parenttravis: Split build scripts for different platforms (diff)
downloadyuzu-d15e15bd058f93f1600c86ad8de7482740724f3f.tar
yuzu-d15e15bd058f93f1600c86ad8de7482740724f3f.tar.gz
yuzu-d15e15bd058f93f1600c86ad8de7482740724f3f.tar.bz2
yuzu-d15e15bd058f93f1600c86ad8de7482740724f3f.tar.lz
yuzu-d15e15bd058f93f1600c86ad8de7482740724f3f.tar.xz
yuzu-d15e15bd058f93f1600c86ad8de7482740724f3f.tar.zst
yuzu-d15e15bd058f93f1600c86ad8de7482740724f3f.zip
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml34
1 files changed, 21 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index b92d7f236..8bad23208 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,24 +2,32 @@ language: cpp
matrix:
include:
- os: linux
+ env: NAME="linux build"
sudo: required
dist: trusty
+ services: docker
+ addons:
+ apt:
+ packages:
+ - p7zip-full
+ install: "./.travis/linux/deps.sh"
+ script: "./.travis/linux/build.sh"
+ after_success: "./.travis/linux/upload.sh"
- os: osx
+ env: NAME="macos build"
sudo: false
osx_image: xcode7.3
-
-services:
- - docker
-
-addons:
- apt:
- packages:
- - clang-format-3.9
- - p7zip-full
-
-install: "./.travis-deps.sh"
-script: "./.travis-build.sh"
-after_success: "./.travis-upload.sh"
+ 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