[Scummvm-git-logs] scummvm master -> 0aba92b4b026f8e3d7849f57926d7c559d7bc52b

[csnover]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0aba92b4b0 Revert "Merge pull request #885 from csnover/faster-travis"


Commit: 0aba92b4b026f8e3d7849f57926d7c559d7bc52b
    https://github.com/scummvm/scummvm/commit/0aba92b4b026f8e3d7849f57926d7c559d7bc52b
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-01-06T12:40:31-06:00

Commit Message:
Revert "Merge pull request #885 from csnover/faster-travis"

Travis builds are failing randomly after this change due to
upstream bug travis-ci/travis-ci#7103, so reverting these changes
until it is fixed.

This reverts commit 72f421cb38149d9a66d7145609be81cec2514d48, reversing
changes made to c919c9996c6f62cf4f0d1a22d0522b0ee9a0514c.

Changed paths:
    .travis.yml


diff --git a/.travis.yml b/.travis.yml
index 418f1b9..7360b8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 language:
   - cpp
 
-sudo: false
-cache: ccache
+sudo: required
 
 addons:
   apt:
     packages:
+    - g++ make
     - libsdl2-dev
     - libsdl2-net-dev
     - libcurl4-openssl-dev