From 9c0b2406870e2de8c187aae2ea2d30dd8a6e4f0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 12 Feb 2019 11:08:37 +0100
Subject: [PATCH] Adjust test matrix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .drone.yml  | 90 ++++++-----------------------------------------------
 .travis.yml |  2 +-
 2 files changed, 10 insertions(+), 82 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 7df7616e9..28c7a4e27 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -22,47 +22,11 @@ pipeline:
     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
+      - CORE_BRANCH=stable15
       - DB=sqlite
     commands:
       - wget https://raw.githubusercontent.com/nextcloud/server/master/build/signed-off-checker.php
@@ -71,23 +35,11 @@ pipeline:
     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
+      - CORE_BRANCH=stable15
       - DB=sqlite
     commands:
       - composer install
@@ -99,7 +51,7 @@ pipeline:
     image: nextcloudci/php7.1:php7.1-15
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=stable15
       - DB=sqlite
     commands:
       - composer install
@@ -111,7 +63,7 @@ pipeline:
     image: nextcloudci/php7.2:php7.2-9
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=stable15
       - DB=sqlite
     commands:
       - composer install
@@ -131,32 +83,11 @@ pipeline:
     when:
       matrix:
         TESTS: syntax-php7.3
-  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
+      - CORE_BRANCH=stable15
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -176,7 +107,7 @@ pipeline:
     image: nextcloudci/php7.1:php7.1-15
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=stable15
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -195,7 +126,7 @@ pipeline:
     image: nextcloudci/php7.2:php7.2-9
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=stable15
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -233,7 +164,7 @@ pipeline:
     image: nextcloudci/integration-php7.0:integration-php7.0-6
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=stable15
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -264,15 +195,12 @@ pipeline:
         TESTS: jsbuild
 matrix:
   include:
-    - TESTS: check-app-compatbility-13
-    - TESTS: check-app-compatbility-14
+    - TESTS: check-app-compatbility
     - TESTS: signed-off-check
-    - TESTS: syntax-php5.6
     - TESTS: syntax-php7.0
     - TESTS: syntax-php7.1
     - TESTS: syntax-php7.2
     - TESTS: syntax-php7.3
-    - TESTS: php5.6
     - TESTS: php7.0
     - TESTS: php7.1
     - TESTS: php7.2
diff --git a/.travis.yml b/.travis.yml
index 6fa4dc6e8..03b4f0cb5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ php:
     - 7.2
     - 7.3
 env:
-    - CORE_BRANCH=stable14 DB=mysql
+    - CORE_BRANCH=stable15 DB=mysql
 
 before_install:
     - wget https://phar.phpunit.de/phpunit-5.7.phar