Merge pull request #442 from nextcloud/debt/noid/branchoff-18

>=3.1.3 to become compatible with 18 only

2 files changed, 9 insertions, 102 deletions

diff --git a/.drone.yml b/.drone.yml
index 3f886ad0..b78bb1e8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,7 +9,7 @@ steps:
     image: nextcloudci/php7.2:php7.2-13
     environment:
       APP_NAME: user_saml
-      CORE_BRANCH: master
+      CORE_BRANCH: stable18
       DB: sqlite
     commands:
       - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
@@ -20,7 +20,7 @@ steps:
 
 trigger:
   branch:
-    - master
+    - stable-3.1
   event:
     - pull_request
     - push
@@ -29,76 +29,17 @@ type: docker
 
 ---
 kind: pipeline
-name: tests-master
-
-clone:
-  depth: 1
-
-steps:
-  - name: php7.2
-    image: nextcloudci/php7.2:php7.2-13
-    environment:
-      APP_NAME: user_saml
-      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/apps/$APP_NAME
-      - cd tests/unit/
-      - phpunit --configuration phpunit.xml
-  - name: php7.3
-    image: nextcloudci/php7.3:php7.3-5
-    environment:
-      APP_NAME: user_saml
-      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/apps/$APP_NAME
-      - cd tests/unit/
-      - phpunit --configuration phpunit.xml
-
-  - name: integration-tests-master
-    image: nextcloudci/user_saml_shibboleth-php7.2:user_saml_shibboleth_php7.2-3
-    environment:
-      CORE_BRANCH: master
-    commands:
-      - /start.sh &
-      - sleep 7
-      - rm -rf /var/www/html
-      - cd /var/www/
-      - git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server html
-      - cd /var/www/html && git submodule update --init
-      # use local clone
-      - cp -r /drone/src /var/www/html/apps/user_saml
-      - scl enable rh-php72 "bash -c 'php /var/www/html/occ maintenance:install --database sqlite --admin-pass password; php /var/www/html/occ app:enable user_saml'"
-      - chown -R apache:apache /var/www/html/
-      - scl enable rh-php72 "bash -c 'cd /var/www/html/apps/user_saml/tests/integration && vendor/bin/behat'"
-
-
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
-
-type: docker
----
-kind: pipeline
-name: tests-19
+name: tests-18
 
 clone:
     depth: 1
 
 steps:
-    - name: php7.3-stable19
-      image: nextcloudci/php7.3:php7.3-5
+    - name: php7.2
+      image: nextcloudci/php7.2:php7.2-13
       environment:
           APP_NAME: user_saml
-          CORE_BRANCH: stable19
+          CORE_BRANCH: stable18
           DB: sqlite
       commands:
           - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
@@ -106,40 +47,6 @@ steps:
           - cd ../server/apps/$APP_NAME
           - cd tests/unit/
           - phpunit --configuration phpunit.xml
-
-    - name: integration-tests-stable19
-      image: nextcloudci/user_saml_shibboleth-php7.2:user_saml_shibboleth_php7.2-3
-      environment:
-          CORE_BRANCH: stable19
-      commands:
-          - /start.sh &
-          - sleep 7
-          - rm -rf /var/www/html
-          - cd /var/www/
-          - git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server html
-          - cd /var/www/html && git submodule update --init
-          # use local clone
-          - cp -r /drone/src /var/www/html/apps/user_saml
-          - scl enable rh-php72 "bash -c 'php /var/www/html/occ maintenance:install --database sqlite --admin-pass password; php /var/www/html/occ app:enable user_saml'"
-          - chown -R apache:apache /var/www/html/
-          - scl enable rh-php72 "bash -c 'cd /var/www/html/apps/user_saml/tests/integration && vendor/bin/behat'"
-
-trigger:
-    branch:
-        - master
-    event:
-        - pull_request
-        - push
-
-type: docker
----
-kind: pipeline
-name: tests-18
-
-clone:
-    depth: 1
-
-steps:
     - name: php7.3-stable18
       image: nextcloudci/php7.3:php7.3-5
       environment:
@@ -172,7 +79,7 @@ steps:
 
 trigger:
     branch:
-        - master
+        - stable-3.1
     event:
         - pull_request
         - push
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 4244ed2f..407dff6f 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -16,7 +16,7 @@ The following providers are supported and tested at the moment:
 	* Any other provider that authenticates using the environment variable
 
 While theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.]]></description>
-	<version>3.1.2</version>
+	<version>3.1.3</version>
 	<licence>agpl</licence>
 	<author>Lukas Reschke</author>
 	<namespace>User_SAML</namespace>
@@ -33,7 +33,7 @@ While theoretically any other authentication provider implementing either one of
 	<screenshot>https://raw.githubusercontent.com/nextcloud/user_saml/master/screenshots/1.png</screenshot>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/user_saml/master/screenshots/2.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="18" max-version="20" />
+		<nextcloud min-version="18" max-version="18" />
 	</dependencies>
 	<commands>
 		<command>OCA\User_SAML\Command\GetMetadata</command>