diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2017-10-06 21:58:48 +0200 |
|---|---|---|
| committer | MerryMage <MerryMage@users.noreply.github.com> | 2017-10-07 13:10:03 +0200 |
| commit | 15a2388a33b1306dcaf16b62432c7a13b40ca2a3 (patch) | |
| tree | 6b1cf31a0e5a02359131d0d11f17b35a009e6a1e /.travis.yml | |
| parent | Merge pull request #2975 from shinyquagsire23/archive-ncch-container-and-override (diff) | |
| download | yuzu-15a2388a33b1306dcaf16b62432c7a13b40ca2a3.tar yuzu-15a2388a33b1306dcaf16b62432c7a13b40ca2a3.tar.gz yuzu-15a2388a33b1306dcaf16b62432c7a13b40ca2a3.tar.bz2 yuzu-15a2388a33b1306dcaf16b62432c7a13b40ca2a3.tar.lz yuzu-15a2388a33b1306dcaf16b62432c7a13b40ca2a3.tar.xz yuzu-15a2388a33b1306dcaf16b62432c7a13b40ca2a3.tar.zst yuzu-15a2388a33b1306dcaf16b62432c7a13b40ca2a3.zip | |
Diffstat (limited to '')
| -rw-r--r-- | .travis.yml | 34 |
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 |