Removing composer.lock causes Travis errors. Trying just updating collabora.

This commit is contained in:
nathangray 2020-03-10 10:48:34 -06:00
parent df1b99824d
commit f8c8dd1496
2 changed files with 11 additions and 12 deletions

View File

@ -46,7 +46,6 @@ before_script:
- sudo service apache2 restart - sudo service apache2 restart
- php -m - php -m
- php -i - php -i
- rm composer.lock
- php install-cli.php --ignore-platform-reqs - php install-cli.php --ignore-platform-reqs
# create data directory # create data directory
- sudo mkdir /var/lib/egroupware - sudo mkdir /var/lib/egroupware

10
composer.lock generated
View File

@ -1,7 +1,7 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "92e5456bf6c24dfb568926895cf688bd", "content-hash": "92e5456bf6c24dfb568926895cf688bd",
@ -774,12 +774,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/EGroupware/collabora.git", "url": "https://github.com/EGroupware/collabora.git",
"reference": "cc6c59bb8397cc61cc419dfd5e5af8c92c1294b7" "reference": "fe9a216bb21004f6ed771c2deb16b9b8928788b7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/EGroupware/collabora/zipball/cc6c59bb8397cc61cc419dfd5e5af8c92c1294b7", "url": "https://api.github.com/repos/EGroupware/collabora/zipball/fe9a216bb21004f6ed771c2deb16b9b8928788b7",
"reference": "cc6c59bb8397cc61cc419dfd5e5af8c92c1294b7", "reference": "fe9a216bb21004f6ed771c2deb16b9b8928788b7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -806,7 +806,7 @@
], ],
"description": "EGroupware integration for Collabora Online Office", "description": "EGroupware integration for Collabora Online Office",
"homepage": "https://www.egroupware.org/", "homepage": "https://www.egroupware.org/",
"time": "2020-03-04T17:42:36+00:00" "time": "2020-03-09T21:21:56+00:00"
}, },
{ {
"name": "egroupware/icalendar", "name": "egroupware/icalendar",