From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 24 Feb 2017 03:33:32 +0000 (-0800)
Subject: build: Simplify Travis configuration
X-Git-Tag: 1.31.0-rc.0~3987
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=407f6b6be8aae4e3792e07f8cc6cefe8d53ce2a4;p=lhc%2Fweb%2Fwiklou.git

build: Simplify Travis configuration

* Remove redundant 'group: edge'. Use the default (stable) instead.
* Use simplified syntax for apt packages. On sudo-enabled VMs, like we
  use now, this translates to the same command. But has the benefit
  of being compatible with the fast non-sudo containers, which we
  want to use in the future. But, for that, djvulibre-bin needs to
  be approved first.
  <https://github.com/travis-ci/apt-package-whitelist/issues/4036>

Bug: T75176
Change-Id: I3b42763ef3f8f08eec08a9008e5cf1e161bb1dff
---

diff --git a/.travis.yml b/.travis.yml
index f2cb40edea..5e2c7a00db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ language: php
 # - Package 'djvulibre-bin' is not yet whitelisted for trusty containers.
 #   https://github.com/travis-ci/apt-package-whitelist/issues/4036
 sudo: required
-group: edge
 # Use Trusty instead of Travis default (precise)
 # - Required in order to use HHVM 3.6 or higher.
 # - Required for non-buggy xml library for XmlTypeCheck/UploadBaseTest (T75176).
@@ -45,9 +44,11 @@ branches:
     - master
     - /^travis-ci\/.*$/
 
-before_install:
-  - sudo apt-get install -qq djvulibre-bin tidy
-  - composer self-update --quiet --no-interaction
+addons:
+  apt:
+    packages:
+    - djvulibre-bin
+    - tidy
 
 before_script:
   - composer install --prefer-source --quiet --no-interaction