From 74c7530a4fad882c0a4d5d3dc2875f86e6b4e75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 12 Jan 2018 15:18:13 +0100 Subject: [PATCH 1/5] Bump maser branch version and nc dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- appinfo/info.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 394d407e0..cee34268d 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -14,7 +14,7 @@ - 🚀 Get your project organized - 0.3.0 + 0.4.0-alpha1 agpl Julius Härtl Deck @@ -25,7 +25,7 @@ https://download.bitgrid.net/nextcloud/deck/screenshots/Deck_Board.png https://download.bitgrid.net/nextcloud/deck/screenshots/Deck_Details.png - + OCA\Deck\Cron\DeleteCron From 009734295c264060ae1f052b879380cbe4900b5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 12 Jan 2018 15:24:59 +0100 Subject: [PATCH 2/5] Add tests for stable13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 42b662663..a5b433770 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ php: - 7.2 env: - CORE_BRANCH=master DB=mysql + - CORE_BRANCH=stable13 DB=mysql - CORE_BRANCH=stable12 DB=mysql matrix: From f34fae640dd507bd28cb6ddd3b3975b9c17bba51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Sat, 13 Jan 2018 10:31:55 +0100 Subject: [PATCH 3/5] Bump drone images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .drone.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 00fe1844e..d045d48c3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ clone: pipeline: check-app-compatbility: - image: nextcloudci/php5.6:php5.6-3 + image: nextcloudci/php7.0:php7.0-17 environment: - APP_NAME=deck - CORE_BRANCH=master @@ -23,16 +23,14 @@ pipeline: matrix: TESTS: check-app-compatbility signed-off-check: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/php7.0:php7.0-17 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 + - wget https://raw.githubusercontent.com/nextcloud/server/master/build/signed-off-checker.php + - php ./signed-off-checker.php when: matrix: TESTS: signed-off-check @@ -40,7 +38,7 @@ pipeline: image: nextcloudci/php5.6:php5.6-8 environment: - APP_NAME=deck - - CORE_BRANCH=master + - CORE_BRANCH=stable13 - DB=sqlite commands: - composer install @@ -88,7 +86,7 @@ pipeline: image: nextcloudci/php5.6:php5.6-8 environment: - APP_NAME=deck - - CORE_BRANCH=master + - CORE_BRANCH=stable13 - DB=sqlite commands: - apt update && apt-get -y install php5-xdebug @@ -166,7 +164,7 @@ pipeline: matrix: TESTS: php7.2 integration: - image: nextcloudci/integration-php7.0:integration-php7.0-3 + image: nextcloudci/integration-php7.0:integration-php7.0-6 environment: - APP_NAME=deck - CORE_BRANCH=master From 2fece55b0e5d6d455e538d978c114b4530047581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Sat, 13 Jan 2018 10:43:19 +0100 Subject: [PATCH 4/5] Use travis for codecov MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .drone.yml | 6 ------ .travis.yml | 10 ++++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index d045d48c3..0b3fd8356 100644 --- a/.drone.yml +++ b/.drone.yml @@ -97,14 +97,8 @@ pipeline: - 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 diff --git a/.travis.yml b/.travis.yml index a5b433770..2a9c11511 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,4 @@ language: php -dist: trusty -sudo: required services: - mysql php: @@ -17,19 +15,20 @@ matrix: exclude: - php: 7.2 env: CORE_BRANCH=stable12 DB=mysql + - php: 5.6 + env: CORE_BRANCH=master 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 + - 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 - ./occ app:enable deck - - php -S localhost:8080 & before_script: - cd apps/deck @@ -37,6 +36,9 @@ before_script: script: - make test-unit +after_success: + - bash <(curl -s https://codecov.io/bash) + after_failure: - cat ../../data/nextcloud.log From f2b94f0933b1995998a1426ab651c9cb5d505ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Sat, 13 Jan 2018 11:48:21 +0100 Subject: [PATCH 5/5] Just test against master in travis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .travis.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a9c11511..f2375f490 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,21 +2,11 @@ language: php services: - mysql php: - - 5.6 - 7.0 - 7.1 - 7.2 env: - CORE_BRANCH=master DB=mysql - - CORE_BRANCH=stable13 DB=mysql - - CORE_BRANCH=stable12 DB=mysql - -matrix: - exclude: - - php: 7.2 - env: CORE_BRANCH=stable12 DB=mysql - - php: 5.6 - env: CORE_BRANCH=master DB=mysql before_install: - wget https://phar.phpunit.de/phpunit-5.7.phar