diff options
| author |  bunnei <bunneidev@gmail.com> | 2015-07-11 21:02:29 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-07-11 21:02:29 -0400 |
| commit | d5f5666f460cfbfc1f4b20c6b60e5636c97050bb (patch) | |
| tree | a0c002a8a35ce29321699dc5c40a972bcb9a5ace /.travis.yml | |
| parent | 8c70b1b8b525de5ff491af934737251bb7ad8bab (diff) | |
| parent | 6fc605a19624106d94b6f871d1f5cdbaa73e7df3 (diff) | |
Merge pull request #915 from citra-emu/travis-container
Travis: Remove use of sudo to enable use container-based builds
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 5c882a57..4d21257b 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 |