From 59c5f17247219612efcee74878dad0b935a5f966 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Sun, 21 Feb 2016 15:48:23 +0100
Subject: try without custom php ini

---
 .travis.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 46e4ac447..b8ec8ec15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ sudo: required
 dist: trusty
 language: php
 php:
+    - 5.5
     - 5.6
     - 7
 env:
@@ -28,7 +29,7 @@ before_install:
     - sh -e /etc/init.d/xvfb start
     - sudo apt-get update
     - sudo apt-get -y install python3-setuptools firefox mariadb-server
-    - sudo easy_install3 requests ocdev
+- sudo easy_install3 requests ocdev
     - nvm install 5.6
     - npm install -g npm@latest
     # install php modules
@@ -43,7 +44,6 @@ before_install:
     - mv news owncloud/apps/
 
 before_script:
-    - phpenv config-add owncloud/apps/news/tests/travis/php.ini
     # set up databases and users for postgres and mysql
     - createuser -U travis -s oc_autotest
     - mysql -u root -e 'create database oc_autotest;'
@@ -69,6 +69,3 @@ script:
     #- webdriver-manager update
     # debug section to check what went wrong
     - sudo cat ../../../data/owncloud.log
-
-addons:
-    #firefox: "latest"
-- 
cgit v1.2.3