summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 870f44ffc..db08fb591 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,10 +30,11 @@ install:
- sudo easy_install3 requests
- sudo easy_install3 ocdev
# clone core
- - ocdev setup core --dir owncloud --branch stable8 --no-history
+ - ocdev setup core --dir owncloud --branch master --no-history
- 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 -e 'create database oc_autotest;'