summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2016-12-08 15:34:33 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2016-12-08 15:34:33 +0100
commitda77cff06839539100f1d90abe33144deead11e7 (patch)
treecaaa21768472328d2b0b014bcf234c4863fff3a7
parent35ae9b1632626c5302a6121b7c81c6c42ced6077 (diff)
debug
-rw-r--r--.travis.yml7
-rw-r--r--composer.lock14
2 files changed, 11 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 5ceaadd9f..eaa2d141d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,9 +36,9 @@ before_install:
- mv news nextcloud/apps/
before_script:
- - if [[ "$DB" == 'pgsql' ]]; then createuser -U postgres -s oc_autotest; echo 'postgres'; fi
+ - if [[ "$DB" == 'pgsql' ]]; then createuser -U postgres -s oc_autotest; fi
- if [[ "$DB" == 'pgsql' ]]; then createdb -U postgres oc_autotest; fi
- - if [[ "$DB" == 'mysql' ]]; then mysql -u root -e 'create database oc_autotest;'; echo 'mysql'; 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 nextcloud with default configs and enable news
@@ -63,4 +63,5 @@ addons:
firefox: "latest"
services:
- - postgresql mysql \ No newline at end of file
+ - postgresql
+ - mysql \ No newline at end of file
diff --git a/composer.lock b/composer.lock
index e3cbbb711..0542244b7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "9518ad408d6c54ebf09c7c68314ddb52",
- "content-hash": "180718a2770d88bdcdf663e62f9604da",
+ "hash": "8d2e9b29809087fa5b3de196be311319",
+ "content-hash": "374e1a4540a77c25fa84a4c7951073ba",
"packages": [
{
"name": "ezyang/htmlpurifier",
@@ -101,16 +101,16 @@
},
{
"name": "pear/net_url2",
- "version": "v2.2.0",
+ "version": "v2.2.1",
"source": {
"type": "git",
"url": "https://github.com/pear/Net_URL2.git",
- "reference": "fa9b1ecb3c3e640d4a54d58d681a4cb7524f209e"
+ "reference": "43a87606daf52efe6685c92131be083143108e37"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/Net_URL2/zipball/fa9b1ecb3c3e640d4a54d58d681a4cb7524f209e",
- "reference": "fa9b1ecb3c3e640d4a54d58d681a4cb7524f209e",
+ "url": "https://api.github.com/repos/pear/Net_URL2/zipball/43a87606daf52efe6685c92131be083143108e37",
+ "reference": "43a87606daf52efe6685c92131be083143108e37",
"shasum": ""
},
"require": {
@@ -158,7 +158,7 @@
"uri",
"url"
],
- "time": "2015-04-18 17:36:57"
+ "time": "2016-04-18 22:24:01"
},
{
"name": "riimu/kit-pathjoin",