From cf03e08d1ebe917db4f64a07a4db04c99c28cb97 Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Tue, 28 Feb 2017 15:20:29 +0100 Subject: [PATCH 1/2] Use drone for testing Signed-off-by: Julius Haertl --- .drone.yml | 140 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 5 +- tests/phpunit.xml | 2 +- 3 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 000000000..c988d8794 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,140 @@ +pipeline: + clone: + image: plugins/git + depth: 1 + check-app-compatbility: + image: nextcloudci/php5.6:php5.6-3 + environment: + - APP_NAME=deck + - CORE_BRANCH=master + - DB=sqlite + commands: + # Pre-setup steps + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh + - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB + - cd ../server + # Code checker + - ./occ app:check-code $APP_NAME -c strong-comparison + - ./occ app:check-code $APP_NAME -c deprecation + - cd apps/$APP_NAME/ + when: + matrix: + TESTS: check-app-compatbility + signed-off-check: + image: nextcloudci/php7.0:php7.0-2 + environment: + - APP_NAME=deck + - CORE_BRANCH=master + - DB=sqlite + commands: + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh + - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB + - cd ../server + - php ./build/signed-off-checker.php + when: + matrix: + TESTS: signed-off-check + syntax-php5.6: + image: nextcloudci/php5.6:php5.6-3 + environment: + - APP_NAME=deck + - CORE_BRANCH=master + - DB=sqlite + commands: + # Pre-setup steps + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh + - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB + - cd ../server + - composer install + - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php . + when: + matrix: + TESTS: syntax-php5.6 + syntax-php7.0: + image: nextcloudci/php7.0:php7.0-2 + environment: + - APP_NAME=deck + - CORE_BRANCH=master + - DB=sqlite + commands: + # Pre-setup steps + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh + - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB + - cd ../server + - composer install + - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php . + when: + matrix: + TESTS: syntax-php7.0 + php5.6: + image: nextcloudci/php5.6:php5.6-3 + environment: + - APP_NAME=deck + - CORE_BRANCH=master + - DB=sqlite + commands: + - apt update && apt-get -y install php5-xdebug + + # Pre-setup steps + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh + - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB + - cd ../server/ + - ./occ app:enable $APP_NAME + - cd apps/$APP_NAME + + - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml + - phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml + + # Create coverage report + - wget https://codecov.io/bash -O codecov.sh + - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t f6375299-4832-487e-b831-091772ab0384; fi" + - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t f6375299-4832-487e-b831-091772ab0384; fi" + when: + matrix: + TESTS: php5.6 + php7.0: + image: nextcloudci/php7.0:php7.0-7 + environment: + - APP_NAME=deck + - CORE_BRANCH=master + - DB=sqlite + commands: + # Pre-setup steps + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh + - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB + - cd ../server/ + - php occ app:enable deck + - cd apps/$APP_NAME + # Run phpunit tests + - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml + - phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml + when: + matrix: + TESTS: php7.0 + php7.1: + image: nextcloudci/php7.1:php7.1-11 + environment: + - APP_NAME=deck + - CORE_BRANCH=master + - DB=sqlite + commands: + # Pre-setup steps + - yum -y install wget + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh + - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB + - cd ../server/ + - php occ app:enable deck + - cd apps/$APP_NAME + - make test + when: + matrix: + TESTS: php7.1 +matrix: + include: + - TESTS: check-app-compatbility + - TESTS: signed-off-check + - TESTS: syntax-php5.6 + - TESTS: syntax-php7.0 + - TESTS: php5.6 + - TESTS: php7.0 + - TESTS: php7.1 diff --git a/Makefile b/Makefile index 8858a0b2c..8982e9596 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,6 @@ appstore: clean-build build test: mkdir -p build/ - cd js && $(npm) run test ifeq (, $(shell which phpunit 2> /dev/null)) @echo "No phpunit command available, downloading a copy from the web" mkdir -p $(build_tools_directory) @@ -83,3 +82,7 @@ else phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml endif + +test-js: + cd js && run test + diff --git a/tests/phpunit.xml b/tests/phpunit.xml index c108da003..4bb7dc40d 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -1,4 +1,4 @@ - + ./unit From 3e3b120175b940625e1452a65996ffb20263e3cf Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Thu, 2 Mar 2017 11:12:22 +0100 Subject: [PATCH 2/2] Add js build and remove tests from travis Signed-off-by: Julius Haertl --- .drone.yml | 11 +++++++++++ .travis.yml | 7 ------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index c988d8794..2cf6418de 100644 --- a/.drone.yml +++ b/.drone.yml @@ -129,6 +129,16 @@ pipeline: when: matrix: TESTS: php7.1 + jsbuild: + image: mhart/alpine-node:6.8.0 + commands: + - apk add --no-cache git + - cd js + - npm install --deps + - ./node_modules/.bin/bower --allow-root install + when: + matrix: + TESTS: jsbuild matrix: include: - TESTS: check-app-compatbility @@ -138,3 +148,4 @@ matrix: - TESTS: php5.6 - TESTS: php7.0 - TESTS: php7.1 + - TESTS: jsbuild diff --git a/.travis.yml b/.travis.yml index 865ba6b2b..997aa2998 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,7 @@ php: - 7 env: matrix: - - CORE_BRANCH=master DB=sqlite TEST_JS=1 - CORE_BRANCH=master DB=mysql - - CORE_BRANCH=stable11 DB=sqlite - CORE_BRANCH=stable11 DB=mysql before_install: @@ -16,7 +14,6 @@ before_install: - bash ./before_install.sh deck $CORE_BRANCH $DB - cd ../server - ./occ app:enable deck - - ./occ app:check-code deck - php -S localhost:8080 & before_script: @@ -24,11 +21,7 @@ before_script: - make install-deps script: - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7.0' ] && [ '$TEST_JS' = '1' ]; then make build-js; fi;" - make test after_failure: - cat ../../data/nextcloud.log - -after_success: - - bash <(curl -s https://codecov.io/bash)