summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2016-03-26 20:59:58 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2016-03-26 20:59:58 +0100
commit093fe1f02efab911c353f215d28c9bdabdc363ae (patch)
tree5765cf9179b02ab618289c252a2db6ee7b532a96 /.travis.yml
parentb7fcad592bf65c92d55c1058b87c9d74359ca13c (diff)
speed up build by only installing db related tasks if db is actually used
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml14
1 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 7b410b2f5..5c13aea8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,8 @@ before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sudo apt-get update
- - sudo apt-get -y install python3-setuptools firefox mariadb-server
+ - sudo apt-get -y install python3-setuptools
+ - if [[ "$DB" == 'mysql' ]]; apt-get -y install mariadb-server; fi
- sudo easy_install3 requests ocdev
- nvm install 5.6
- npm install -g npm@latest
@@ -37,10 +38,10 @@ before_install:
- mv news owncloud/apps/
before_script:
- - createuser -U travis -s oc_autotest
- - mysql -u root -e 'create database oc_autotest;'
- - mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"
- - mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"
+ - if [[ "$DB" == 'pgsql' ]]; then createuser -U travis -s oc_autotest; fi
+ - if [[ "$DB" == 'mysql' ]]; then mysql -u root -e 'create database oc_autotest;'; fi
+ - if [[ "$DB" == 'mysql' ]]; then mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"; fi
+ - if [[ "$DB" == 'mysql' ]]; then mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"; fi
# fill owncloud with default configs and enable news
- cd owncloud
- mkdir data
@@ -69,3 +70,6 @@ deploy:
on:
repo: owncloud/news
tags: true
+
+addons:
+ firefox: "latest"