diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-12-08 15:13:24 +0100 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-12-08 15:13:24 +0100 |
| commit | 1344278155680fcb05a27f403ef736171e7f985c (patch) | |
| tree | 5872496bcf414031842a165cdf6d22a3a4b681cc | |
| parent | c41b02293ecbf0a5e19346c1b79f0030b9d9bd85 (diff) | |
travis updates
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | composer.json | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index e6579e269..c965da7cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ php: - 7 env: global: - - CORE_BRANCH=stable11 + - CORE_BRANCH=master matrix: - DB=pgsql @@ -36,7 +36,8 @@ before_install: - mv news nextcloud/apps/ before_script: - - if [[ "$DB" == 'pgsql' ]]; then createuser -U travis -s oc_autotest; 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;'; 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 diff --git a/composer.json b/composer.json index 9c2f29975..03f7fff4b 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "require": { "ezyang/htmlpurifier": "4.8", "fguillot/picofeed": "dev-master#b0da4c4de928ba0bc879f27b2a99f77355b9afa7", - "pear/net_url2": "2.2", + "pear/net_url2": "2.2.1", "riimu/kit-pathjoin": "1.1.2" } } |