mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 14:41:29 +01:00
try fixing Travis builds stalled by composer.lock already containing phpunit, which version depends on php version used
This commit is contained in:
Ralf Becker
parent
4e2db6c789
commit
0185f0aff6
@ -20,10 +20,10 @@ checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed '
|
|||||||
[]
|
[]
|
||||||
# to run composer.phar automatic, this .mrconfig need to be trusted by adding it to ~/.mrtrust
|
# to run composer.phar automatic, this .mrconfig need to be trusted by adding it to ~/.mrtrust
|
||||||
checkout = git clone git@github.com:EGroupware/egroupware.git &&
|
checkout = git clone git@github.com:EGroupware/egroupware.git &&
|
||||||
/usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install --no-dev
|
/usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install
|
||||||
update = git stash -q || true ; git pull --rebase ; git stash pop -q 2>/dev/null || true;
|
update = git stash -q || true ; git pull --rebase ; git stash pop -q 2>/dev/null || true;
|
||||||
rm -rf api/js/ckeditor;
|
rm -rf api/js/ckeditor;
|
||||||
/usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install --no-dev
|
/usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install
|
||||||
# uncomment for minified javascript and css, IF you have nodejs and grunt installed: npm install -g grunt-cli
|
# uncomment for minified javascript and css, IF you have nodejs and grunt installed: npm install -g grunt-cli
|
||||||
#post_checkout = /usr/bin/env npm install && /usr/bin/env grunt
|
#post_checkout = /usr/bin/env npm install && /usr/bin/env grunt
|
||||||
#post_update = /usr/bin/env npm install && /usr/bin/env grunt
|
#post_update = /usr/bin/env npm install && /usr/bin/env grunt
|
||||||
|
|||||||
@ -57,7 +57,7 @@ before_script:
|
|||||||
- mr --trust-all --stats up
|
- mr --trust-all --stats up
|
||||||
- (cd activesync; mr --trust-all --stats up)
|
- (cd activesync; mr --trust-all --stats up)
|
||||||
# installing phpunit in version suitable for used PHP version
|
# installing phpunit in version suitable for used PHP version
|
||||||
- composer update phpunit/phpunit
|
- composer require 'phpunit/phpunit:~4.8|~5.4'
|
||||||
# create data directory
|
# create data directory
|
||||||
- sudo mkdir /var/lib/egroupware
|
- sudo mkdir /var/lib/egroupware
|
||||||
- sudo chown travis /var/lib/egroupware
|
- sudo chown travis /var/lib/egroupware
|
||||||
|
|||||||
@ -38,6 +38,5 @@
|
|||||||
"egroupware/ckeditor": "^4.5"
|
"egroupware/ckeditor": "^4.5"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "~4.8|~5.4"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
285
composer.lock
generated
285
composer.lock
generated
@ -4,8 +4,8 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
"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"
|
||||||
],
|
],
|
||||||
"hash": "13f34d9fddaad73e035214a34b33b339",
|
"hash": "77f5ad533eceace57d2f7d955dbba553",
|
||||||
"content-hash": "6b6a59e5fcee9d0e43cc979b1efbb465",
|
"content-hash": "c267eda5d6e10c4221a3760f0389e1e4",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "adldap2/adldap2",
|
"name": "adldap2/adldap2",
|
||||||
@ -217,6 +217,60 @@
|
|||||||
"bower-asset-ignore": []
|
"bower-asset-ignore": []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "doctrine/instantiator",
|
||||||
|
"version": "1.0.5",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/doctrine/instantiator.git",
|
||||||
|
"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
|
||||||
|
"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3,<8.0-DEV"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"athletic/athletic": "~0.1.8",
|
||||||
|
"ext-pdo": "*",
|
||||||
|
"ext-phar": "*",
|
||||||
|
"phpunit/phpunit": "~4.0",
|
||||||
|
"squizlabs/php_codesniffer": "~2.0"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.0.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Marco Pivetta",
|
||||||
|
"email": "ocramius@gmail.com",
|
||||||
|
"homepage": "http://ocramius.github.com/"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
|
||||||
|
"homepage": "https://github.com/doctrine/instantiator",
|
||||||
|
"keywords": [
|
||||||
|
"constructor",
|
||||||
|
"instantiate"
|
||||||
|
],
|
||||||
|
"time": "2015-06-14 21:17:01"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "egroupware/ckeditor",
|
"name": "egroupware/ckeditor",
|
||||||
"version": "v4.5.11",
|
"version": "v4.5.11",
|
||||||
@ -307,6 +361,48 @@
|
|||||||
],
|
],
|
||||||
"time": "2016-07-01 12:04:16"
|
"time": "2016-07-01 12:04:16"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "myclabs/deep-copy",
|
||||||
|
"version": "1.5.4",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/myclabs/DeepCopy.git",
|
||||||
|
"reference": "ea74994a3dc7f8d2f65a06009348f2d63c81e61f"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/ea74994a3dc7f8d2f65a06009348f2d63c81e61f",
|
||||||
|
"reference": "ea74994a3dc7f8d2f65a06009348f2d63c81e61f",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.4.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"doctrine/collections": "1.*",
|
||||||
|
"phpunit/phpunit": "~4.1"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"DeepCopy\\": "src/DeepCopy/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"description": "Create deep copies (clones) of your objects",
|
||||||
|
"homepage": "https://github.com/myclabs/DeepCopy",
|
||||||
|
"keywords": [
|
||||||
|
"clone",
|
||||||
|
"copy",
|
||||||
|
"duplicate",
|
||||||
|
"object",
|
||||||
|
"object graph"
|
||||||
|
],
|
||||||
|
"time": "2016-09-16 13:37:59"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "npm-asset/as-jqplot",
|
"name": "npm-asset/as-jqplot",
|
||||||
"version": "1.0.8",
|
"version": "1.0.8",
|
||||||
@ -1465,104 +1561,6 @@
|
|||||||
"BSD License"
|
"BSD License"
|
||||||
],
|
],
|
||||||
"description": "Selection of methods that are often needed when working with XML documents. Functionality includes creating of attribute lists from arrays, creation of tags, validation of XML names and more."
|
"description": "Selection of methods that are often needed when working with XML documents. Functionality includes creating of attribute lists from arrays, creation of tags, validation of XML names and more."
|
||||||
}
|
|
||||||
],
|
|
||||||
"packages-dev": [
|
|
||||||
{
|
|
||||||
"name": "doctrine/instantiator",
|
|
||||||
"version": "1.0.5",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/doctrine/instantiator.git",
|
|
||||||
"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
|
|
||||||
"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"php": ">=5.3,<8.0-DEV"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"athletic/athletic": "~0.1.8",
|
|
||||||
"ext-pdo": "*",
|
|
||||||
"ext-phar": "*",
|
|
||||||
"phpunit/phpunit": "~4.0",
|
|
||||||
"squizlabs/php_codesniffer": "~2.0"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "1.0.x-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Marco Pivetta",
|
|
||||||
"email": "ocramius@gmail.com",
|
|
||||||
"homepage": "http://ocramius.github.com/"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
|
|
||||||
"homepage": "https://github.com/doctrine/instantiator",
|
|
||||||
"keywords": [
|
|
||||||
"constructor",
|
|
||||||
"instantiate"
|
|
||||||
],
|
|
||||||
"time": "2015-06-14 21:17:01"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "myclabs/deep-copy",
|
|
||||||
"version": "1.5.4",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/myclabs/DeepCopy.git",
|
|
||||||
"reference": "ea74994a3dc7f8d2f65a06009348f2d63c81e61f"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/ea74994a3dc7f8d2f65a06009348f2d63c81e61f",
|
|
||||||
"reference": "ea74994a3dc7f8d2f65a06009348f2d63c81e61f",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"php": ">=5.4.0"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"doctrine/collections": "1.*",
|
|
||||||
"phpunit/phpunit": "~4.1"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"DeepCopy\\": "src/DeepCopy/"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"description": "Create deep copies (clones) of your objects",
|
|
||||||
"homepage": "https://github.com/myclabs/DeepCopy",
|
|
||||||
"keywords": [
|
|
||||||
"clone",
|
|
||||||
"copy",
|
|
||||||
"duplicate",
|
|
||||||
"object",
|
|
||||||
"object graph"
|
|
||||||
],
|
|
||||||
"time": "2016-09-16 13:37:59"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpdocumentor/reflection-common",
|
"name": "phpdocumentor/reflection-common",
|
||||||
@ -2016,88 +2014,6 @@
|
|||||||
],
|
],
|
||||||
"time": "2015-09-15 10:49:45"
|
"time": "2015-09-15 10:49:45"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "phpunit/phpunit",
|
|
||||||
"version": "5.6.0",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
|
||||||
"reference": "a7f2db56518e50ab92f28f739810dfad2f223b6b"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a7f2db56518e50ab92f28f739810dfad2f223b6b",
|
|
||||||
"reference": "a7f2db56518e50ab92f28f739810dfad2f223b6b",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"ext-dom": "*",
|
|
||||||
"ext-json": "*",
|
|
||||||
"ext-libxml": "*",
|
|
||||||
"ext-mbstring": "*",
|
|
||||||
"ext-xml": "*",
|
|
||||||
"myclabs/deep-copy": "~1.3",
|
|
||||||
"php": "^5.6 || ^7.0",
|
|
||||||
"phpspec/prophecy": "^1.3.1",
|
|
||||||
"phpunit/php-code-coverage": "^4.0.1",
|
|
||||||
"phpunit/php-file-iterator": "~1.4",
|
|
||||||
"phpunit/php-text-template": "~1.2",
|
|
||||||
"phpunit/php-timer": "^1.0.6",
|
|
||||||
"phpunit/phpunit-mock-objects": "^3.2",
|
|
||||||
"sebastian/comparator": "~1.1",
|
|
||||||
"sebastian/diff": "~1.2",
|
|
||||||
"sebastian/environment": "^1.3 || ^2.0",
|
|
||||||
"sebastian/exporter": "~1.2",
|
|
||||||
"sebastian/global-state": "~1.0",
|
|
||||||
"sebastian/object-enumerator": "~1.0",
|
|
||||||
"sebastian/resource-operations": "~1.0",
|
|
||||||
"sebastian/version": "~1.0|~2.0",
|
|
||||||
"symfony/yaml": "~2.1|~3.0"
|
|
||||||
},
|
|
||||||
"conflict": {
|
|
||||||
"phpdocumentor/reflection-docblock": "3.0.2"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"ext-pdo": "*"
|
|
||||||
},
|
|
||||||
"suggest": {
|
|
||||||
"ext-xdebug": "*",
|
|
||||||
"phpunit/php-invoker": "~1.1"
|
|
||||||
},
|
|
||||||
"bin": [
|
|
||||||
"phpunit"
|
|
||||||
],
|
|
||||||
"type": "library",
|
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "5.6.x-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"classmap": [
|
|
||||||
"src/"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"BSD-3-Clause"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Sebastian Bergmann",
|
|
||||||
"email": "sebastian@phpunit.de",
|
|
||||||
"role": "lead"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "The PHP Unit Testing framework.",
|
|
||||||
"homepage": "https://phpunit.de/",
|
|
||||||
"keywords": [
|
|
||||||
"phpunit",
|
|
||||||
"testing",
|
|
||||||
"xunit"
|
|
||||||
],
|
|
||||||
"time": "2016-10-06 15:20:39"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit-mock-objects",
|
"name": "phpunit/phpunit-mock-objects",
|
||||||
"version": "3.3.1",
|
"version": "3.3.1",
|
||||||
@ -2770,9 +2686,12 @@
|
|||||||
"time": "2016-08-09 15:02:57"
|
"time": "2016-08-09 15:02:57"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"packages-dev": [],
|
||||||
"aliases": [],
|
"aliases": [],
|
||||||
"minimum-stability": "stable",
|
"minimum-stability": "stable",
|
||||||
"stability-flags": [],
|
"stability-flags": {
|
||||||
|
"php": 15
|
||||||
|
},
|
||||||
"prefer-stable": false,
|
"prefer-stable": false,
|
||||||
"prefer-lowest": false,
|
"prefer-lowest": false,
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user