diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-02-21 15:48:23 +0100 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-02-21 15:48:23 +0100 |
commit | 59c5f17247219612efcee74878dad0b935a5f966 (patch) | |
tree | a6f62f9e1a7b0881bdc53e1a6954a2243be66f77 | |
parent | e4e3fbf5effd3ff94e866f5bd9b31fc5fbed70fd (diff) |
try without custom php ini
-rw-r--r-- | .travis.yml | 7 | ||||
-rw-r--r-- | CHANGELOG.md | 3 | ||||
-rw-r--r-- | appinfo/info.xml | 2 |
3 files changed, 6 insertions, 6 deletions
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" diff --git a/CHANGELOG.md b/CHANGELOG.md index fe22b5f5d..6cce82bd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +owncloud-news (7.2.0) +* **New dependency**: Bump required PostgreSQL version to 9.4 + owncloud-news (7.1.2) * **Enhancement**: Major JavaScript library updates: * Update from Angular 1.3 to 1.5 diff --git a/appinfo/info.xml b/appinfo/info.xml index c856e7602..0f2f57b02 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -24,7 +24,7 @@ <requiremin>8.1</requiremin> <dependencies> <owncloud min-version="8.2" max-version="9.0"/> - <php min-version="5.6" /> + <php min-version="5.5" /> <database min-version="9.4">pgsql</database> <database>sqlite</database> <database>mysql</database> |