From 407f6b6be8aae4e3792e07f8cc6cefe8d53ce2a4 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Thu, 23 Feb 2017 19:33:32 -0800 Subject: [PATCH] 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. Bug: T75176 Change-Id: I3b42763ef3f8f08eec08a9008e5cf1e161bb1dff --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 -- 2.20.1