Merge branch 'master' into vue

.drone.yml

@@ -1,151 +1,74 @@
-clone:
-  git:
-    image: plugins/git
-    depth: 1
-
-pipeline:
-  check-app-compatbility:
+kind: pipeline
+name: checkers
+steps:
+- name: compatibility
+  image: nextcloudci/php7.1:php7.1-16
+  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/
+- name: syntax-php7.0
+  image: nextcloudci/php7.0:php7.0-17
+  environment:
+    APP_NAME: deck
+    CORE_BRANCH: stable15
+    DB: sqlite
+  commands:
+    - composer install
+    - ./vendor/bin/parallel-lint --exclude ./vendor/ --exclude ./lib/Collaboration/ .
+- name: syntax-php7.1
+  image: nextcloudci/php7.1:php7.1-15
+  environment:
+    APP_NAME: deck
+    CORE_BRANCH: stable15
+    DB: sqlite
+  commands:
+    - composer install
+    - ./vendor/bin/parallel-lint --exclude ./vendor/ .
+- name: syntax-php7.2
+  image: nextcloudci/php7.2:php7.2-9
+  environment:
+    APP_NAME: deck
+    CORE_BRANCH: stable15
+    DB: sqlite
+  commands:
+    - composer install
+    - ./vendor/bin/parallel-lint --exclude ./vendor/ .
+- name: syntax-php7.3
+  image: nextcloudci/php7.3:php7.3-2
+  environment:
+    APP_NAME: deck
+    CORE_BRANCH: stable15
+    DB: sqlite
+  commands:
+    - composer install
+    - ./vendor/bin/parallel-lint --exclude ./vendor/ .
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+---
+kind: pipeline
+name: unit-php7.0
+steps:
+  - name: php7.0
     image: nextcloudci/php7.0:php7.0-17
     environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable15
-      - 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
-  check-app-compatbility-14:
-    image: nextcloudci/php7.0:php7.0-17
-    environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable14
-      - 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-14
-  check-app-compatbility-13:
-    image: nextcloudci/php7.0:php7.0-17
-    environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable13
-      - 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-13
-  signed-off-check:
-    image: nextcloudci/php7.0:php7.0-17
-    environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable14
-      - DB=sqlite
-    commands:
-      - wget https://raw.githubusercontent.com/nextcloud/server/master/build/signed-off-checker.php
-      - php ./signed-off-checker.php
-    secrets: [ github_token ]
-    when:
-      matrix:
-        TESTS: signed-off-check
-  syntax-php5.6:
-    image: nextcloudci/php5.6:php5.6-8
-    environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable13
-      - DB=sqlite
-    commands:
-      - composer install
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
-    when:
-      matrix:
-        TESTS: syntax-php5.6
-  syntax-php7.0:
-    image: nextcloudci/php7.0:php7.0-17
-    environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable14
-      - DB=sqlite
-    commands:
-      - composer install
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
-    when:
-      matrix:
-        TESTS: syntax-php7.0
-  syntax-php7.1:
-    image: nextcloudci/php7.1:php7.1-15
-    environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable14
-      - DB=sqlite
-    commands:
-      - composer install
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
-    when:
-      matrix:
-        TESTS: syntax-php7.1
-  syntax-php7.2:
-    image: nextcloudci/php7.2:php7.2-9
-    environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable14
-      - DB=sqlite
-    commands:
-      - composer install
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
-    when:
-      matrix:
-        TESTS: syntax-php7.2
-  php5.6:
-    image: nextcloudci/php5.6:php5.6-8
-    environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable13
-      - 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
-      - composer install
-      - 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: php5.6
-  php7.0:
-    image: nextcloudci/php7.0:php7.0-17
-    environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable14
-      - DB=sqlite
+      APP_NAME: deck
+      CORE_BRANCH: stable15
+      DB: sqlite
     commands:
       # Pre-setup steps
       - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
@@ -157,15 +80,23 @@ pipeline:
       - composer install
       - 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:
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+---
+kind: pipeline
+name: unit-php7.1
+steps:
+  - name: php7.1
     image: nextcloudci/php7.1:php7.1-15
     environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable14
-      - DB=sqlite
+      APP_NAME: deck
+      CORE_BRANCH: stable15
+      DB: sqlite
     commands:
       # Pre-setup steps
       - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
@@ -176,15 +107,23 @@ pipeline:
       - composer install
       - 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.1
-  php7.2:
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+---
+kind: pipeline
+name: unit-php7.2
+steps:
+  - name: php7.2
     image: nextcloudci/php7.2:php7.2-9
     environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable14
-      - DB=sqlite
+      APP_NAME: deck
+      CORE_BRANCH: stable15
+      DB: sqlite
     commands:
       # Pre-setup steps
       - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
@@ -195,15 +134,50 @@ pipeline:
       - composer install
       - 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.2
-  integration:
-    image: nextcloudci/integration-php7.0:integration-php7.0-6
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+---
+kind: pipeline
+name: unit-php7.3
+steps:
+  - name: php7.3
+    image: nextcloudci/php7.3:php7.3-2
     environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable14
-      - DB=sqlite
+      APP_NAME: deck
+      CORE_BRANCH: stable15
+      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
+      - composer install
+      - 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
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+---
+kind: pipeline
+name: integration-stable16
+steps:
+  - name: integration
+    image: nextcloudci/php7.1:php7.1-16
+    environment:
+      APP_NAME: deck
+      CORE_BRANCH: stable16
+      DB: sqlite
     commands:
       # Pre-setup steps
       - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
@@ -212,43 +186,58 @@ pipeline:
       - php occ app:enable deck
       - cd apps/$APP_NAME
       - cd tests/integration
-      - ./run.sh
-    when:
-      matrix:
-        TESTS: integration
-  eslint:
+      - ./run.sh || true
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+---
+kind: pipeline
+name: integration-stable15
+steps:
+  - name: integration
+    image: nextcloudci/php7.1:php7.1-16
+    environment:
+      APP_NAME: deck
+      CORE_BRANCH: stable15
+      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
+      - cd tests/integration
+      - ./run.sh || true
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: frontend
+steps:
+  - name: eslint
     image: node:11-alpine
     commands:
-      - npm install
       - npm run lint
-    when:
-      matrix:
-        TESTS: eslint
-  jsbuild:
+  - name: jsbuild
     image: node:11-alpine
     commands:
       - npm install
       - npm run build
-    when:
-      matrix:
-        TESTS: jsbuild
-matrix:
-  include:
-    - TESTS: check-app-compatbility-13
-    - TESTS: check-app-compatbility-14
-    - TESTS: signed-off-check
-    - TESTS: syntax-php5.6
-    - TESTS: syntax-php7.0
-    - TESTS: syntax-php7.1
-    - TESTS: syntax-php7.2
-    - TESTS: php5.6
-    - TESTS: php7.0
-    - TESTS: php7.1
-    - TESTS: php7.2
-    - TESTS: eslint
-    - TESTS: jsbuild
-    #- TESTS: integration
-
-branches: [ master, stable*, vue ]
-
-
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push