From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 23 Nov 2018 07:50:16 +0000 (+0100)
Subject: Use new Travis infra
X-Git-Tag: 2.3.4~1^2~2
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=d470f817ac1452260121279a455b697cf881ac96;hp=dc90eab32bd1912a1541ba238dcd2c34e6171e94

Use new Travis infra
---

diff --git a/.travis.yml b/.travis.yml
index eb409533..ce50fcc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,14 @@
 language: php
 
 services:
-  - rabbitmq
-  - redis
-
-# faster builds on docker-container setup
-sudo: false
+    - rabbitmq
+    - redis
 
 # used for HHVM
 addons:
-  apt:
-    packages:
-      - tidy
+    apt:
+        packages:
+            - tidy
 
 # cache vendor dirs
 cache:
@@ -68,7 +65,7 @@ before_install:
     - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
 
 script:
-    - travis_wait bash composer install -o  --no-interaction --no-progress --prefer-dist
+    - COMPOSER_MEMORY_LIMIT=-1 travis_wait bash composer install -o  --no-interaction --no-progress --prefer-dist
     - echo "travis_fold:start:prepare"
     - make prepare DB=$DB
     - echo "travis_fold:end:prepare"