From 9f0b23d724e40436e09b125f94af28963284d81c Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Sat, 13 Feb 2016 18:59:50 +0100
Subject: further consolidations

---
 .travis.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 6a26a65cc..26aa0c12f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,22 +25,18 @@ matrix:
     fast_finish: true
 
 before_install:
-    # get a newer node.js version
     - "export DISPLAY=:99.0"
     - "sh -e /etc/init.d/xvfb start"
+
+install:
     - sudo apt-get update
-    - sudo apt-get install -o DPkg::Options::="--force-confold" -y libxml2 libxml2-dev libxml2-utils
+    - sudo apt-get install -o DPkg::Options::="--force-confold" -y libxml2 libxml2-dev libxml2-utils python3-jinja2 python3-setuptools apache2 libapache2-mod-fastcgi firefox curl
+    - sudo easy_install3 requests ocdev
     - nvm install 5.0
     - nvm use 5.0
     - npm install -g npm@latest
-
-install:
-    - cd ..
-    - sudo apt-get -y install python3-jinja2 python3-setuptools apache2 libapache2-mod-fastcgi firefox curl
-    - export CHROME_BIN=/usr/bin/chromium-browser
-    - sudo easy_install3 requests
-    - sudo easy_install3 ocdev
     # clone core
+    - cd ..
     - ocdev setup core --dir owncloud --branch $CORE_BRANCH --no-history
     - mv news owncloud/apps/
 
-- 
cgit v1.2.3