From 021b1864245ef91275a1b6e12b038945a442407b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 20 Mar 2017 08:53:17 +0100 Subject: [PATCH 1/3] Use phpunit 5.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8982e9596..b33771854 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ test: ifeq (, $(shell which phpunit 2> /dev/null)) @echo "No phpunit command available, downloading a copy from the web" mkdir -p $(build_tools_directory) - curl -sSL https://phar.phpunit.de/phpunit.phar -o $(build_tools_directory)/phpunit.phar + curl -sSL https://phar.phpunit.de/phpunit-5.7.phar -o $(build_tools_directory)/phpunit.phar php $(build_tools_directory)/phpunit.phar -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml php $(build_tools_directory)/phpunit.phar -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml else From 8444a00bdf7b1eb457cdd953a855f19928e95495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 20 Mar 2017 09:01:15 +0100 Subject: [PATCH 2/3] Travis fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 46dbe7944..553f71e58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,12 @@ env: - CORE_BRANCH=stable11 DB=mysql before_install: + - wget https://phar.phpunit.de/phpunit-5.7.phar + - chmod +x phpunit-5.7.phar + - mkdir bin + - sudo mv phpunit-5.7.phar bin/phpunit + - export PATH="$PWD/bin:$PATH" + - phpunit --version - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh - bash ./before_install.sh deck $CORE_BRANCH $DB - cd ../server From 7dba3547676609aece82b4187d235f339e95484a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 20 Mar 2017 09:39:10 +0100 Subject: [PATCH 3/3] Remove npm install --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 553f71e58..b0831b712 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,6 @@ before_install: before_script: - cd apps/deck - - make install-deps script: - make test