summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-07-12 03:02:29 +0200
committerbunnei <bunneidev@gmail.com>2015-07-12 03:02:29 +0200
commitd5f5666f460cfbfc1f4b20c6b60e5636c97050bb (patch)
treea0c002a8a35ce29321699dc5c40a972bcb9a5ace /.travis.yml
parentMerge pull request #919 from yuriks/styleguide (diff)
parentTravis: Replace `before_install` with `install` (diff)
downloadyuzu-d5f5666f460cfbfc1f4b20c6b60e5636c97050bb.tar
yuzu-d5f5666f460cfbfc1f4b20c6b60e5636c97050bb.tar.gz
yuzu-d5f5666f460cfbfc1f4b20c6b60e5636c97050bb.tar.bz2
yuzu-d5f5666f460cfbfc1f4b20c6b60e5636c97050bb.tar.lz
yuzu-d5f5666f460cfbfc1f4b20c6b60e5636c97050bb.tar.xz
yuzu-d5f5666f460cfbfc1f4b20c6b60e5636c97050bb.tar.zst
yuzu-d5f5666f460cfbfc1f4b20c6b60e5636c97050bb.zip
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml22
1 files changed, 16 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 5c882a574..4d21257bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,11 +8,21 @@ env:
global:
- secure: "AXHFIafTmbGDsHD3mUVj5a4I397DQjti/WoqAJGUp2PglxTcc04BwxZ9Z+xLuf5N2Hs5r9ojAJLT8OGxJCLBDXzneQTNSqXbFuYSLbqrEAiIRlA9eRIotWCg+wYcO+5e8MKX+cHVKwiIWasUB21AtCdq6msh6Y3pUshZp212VPg="
-before_install:
- - sh .travis-deps.sh
+sudo: false
-script:
- - sh .travis-build.sh
+addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - gcc-4.9
+ - g++-4.9
+ - xorg-dev
+ - libglu1-mesa-dev
+ - libxcursor-dev
+ - lib32stdc++6 # For CMake
+ - lftp # To upload builds
-after_success:
- - sh .travis-upload.sh
+install: ./.travis-deps.sh
+script: ./.travis-build.sh
+after_success: ./.travis-upload.sh