From 6b45abc2b62b540454bc1fb3d28e71a28448029a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 19 Dec 2019 19:28:50 +0100
Subject: [PATCH] Test master against 18
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  | 29 -----------------------------
 .travis.yml |  6 ++++--
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 841454f..3e13264 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,33 +1,4 @@
 kind: pipeline
-name: check-app-compatbility
-
-steps:
-  - name: check-app-compatbility
-    image: nextcloudci/php7.1:php7.1-16
-    environment:
-      APP_NAME: groupfolders
-      CORE_BRANCH: stable17 
-      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
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
 name: frontend
 steps:
   - name: jsbuild
diff --git a/.travis.yml b/.travis.yml
index 9683d87..5507302 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,15 @@
 language: php
 php:
-  - 7.1
   - 7.2
   - 7.3
+  - 7.4
 
 env:
   global:
     - APP_NAME=groupfolders
     - DB=sqlite
   matrix:
-    - CORE_BRANCH=stable17
+    - CORE_BRANCH=master
 
 branches:
   only:
@@ -27,6 +27,8 @@ before_script:
   - mkdir data
   - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database $DB --database-pass=''
   - ./occ app:enable $APP_NAME
+  - ./occ app:check-code $APP_NAME -c strong-comparison
+  - ./occ app:check-code $APP_NAME -c deprecation
   - cd apps/$APP_NAME
   - composer install