diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-02-21 19:43:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-21 19:43:46 +0300 |
| commit | e4307d136e803449156377ea794fc8b9f7c4db25 (patch) | |
| tree | 3389227797829cd92b82464568a3b7a46609aa02 | |
| parent | 36cf6b52d1806ce0d28254f73aa02f8db18e6c76 (diff) | |
| parent | 9a91d86a44b6cf870b118a0bdbd4a1a11ca23d77 (diff) | |
Merge pull request #6 from nextcloud/phpunit-update-for-apps
PHPUnit 6.5 for apps on master/14+
| -rwxr-xr-x | before_install.sh | 10 | ||||
| -rw-r--r-- | composer-phpunit5.json | 5 | ||||
| -rw-r--r-- | composer.json | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/before_install.sh b/before_install.sh index 44257c5..0923be1 100755 --- a/before_install.sh +++ b/before_install.sh @@ -83,10 +83,16 @@ fi bash ./core_install.sh $DB # -# install phpunit 5.* for BC on php7 +# install fixed phpunit version # cd .. -wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/composer.json + +if [ "$CORE_BRANCH" == "stable13" -o "$CORE_BRANCH" == "stable12" -o "$CORE_BRANCH" == "stable11" -o "$CORE_BRANCH" == "stable10" -o "$CORE_BRANCH" == "stable9" ]; then + wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/composer-phpunit5.json + mv composer-phpunit5.json composer.json +else + wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/composer.json +fi composer install export PATH="$PWD/vendor/bin:$PATH" cd $WORKDIR diff --git a/composer-phpunit5.json b/composer-phpunit5.json new file mode 100644 index 0000000..2ea670d --- /dev/null +++ b/composer-phpunit5.json @@ -0,0 +1,5 @@ +{ + "require": { + "phpunit/phpunit": "^5.2" + } +} diff --git a/composer.json b/composer.json index 2ea670d..c08205e 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { "require": { - "phpunit/phpunit": "^5.2" + "phpunit/phpunit": "^6.5" } } |