From a89dda9e04002cf7e61a719b931ab5835239ff5a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 12 Apr 2019 09:20:25 +0200 Subject: [PATCH 1/3] DOC is done with the app Signed-off-by: Joas Schilling --- .drone.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3877a6553..9cc970d39 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,21 +4,6 @@ clone: depth: 1 pipeline: - signed-off-check: - image: nextcloudci/php7.1:php7.1-16 - environment: - - APP_NAME=activity - - 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 - secrets: [ github_token ] - when: - matrix: - TESTS: signed-off-check handlebars: image: node commands: @@ -30,5 +15,4 @@ pipeline: matrix: include: - - TESTS: signed-off-check - TESTS: handlebars From 51ca1a88a54bff21fce0a74cd05a5f4fcf73bbea Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 12 Apr 2019 09:20:42 +0200 Subject: [PATCH 2/3] Adjust drone config for v1.0 Signed-off-by: Joas Schilling --- .drone.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9cc970d39..8aa4b5e17 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,18 +1,17 @@ -clone: - git: - image: plugins/git - depth: 1 +kind: pipeline +name: handlebars -pipeline: - handlebars: +steps: + - name: check-handlebars-templates image: node commands: - npm install -g handlebars - ./check-handlebars-templates.sh - when: - matrix: - TESTS: handlebars -matrix: - include: - - TESTS: handlebars +trigger: + branch: + - master + - stable* + event: + - pull_request + - push From f7f57b597b3480124f413e648efaa2d0fb7baa6b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 12 Apr 2019 09:21:32 +0200 Subject: [PATCH 3/3] Disable always failing JS unit tests Signed-off-by: Joas Schilling --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 230453c17..a6000d2d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,8 +60,8 @@ matrix: env: DB=mysql;CODECHECK=1 - php: 7.1 env: DB=mysql;CODECHECK=2 - - php: 7.1 - env: DB=mysql;JSTESTS=1 +# - php: 7.1 +# env: DB=mysql;JSTESTS=1 allow_failures: - env: DB=mysql;CODECHECK=2 fast_finish: true