Merge pull request #657 from nextcloud/update-master-target-versions

Adjust testing matrix for Nextcloud 26 on master

.drone.yml

@@ -33,6 +33,42 @@ trigger:
 
 type: docker
 
+---
+kind: pipeline
+name: integration-tests-stable25
+
+clone:
+  depth: 1
+
+steps:
+  - name: integration-tests-stable25
+    image: ghcr.io/nextcloud/continuous-integration-user_saml_shibboleth-php8.0:latest
+    environment:
+      CORE_BRANCH: stable25
+    commands:
+      - /start.sh
+      - /wait-for-services.sh
+      - 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
+      - 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/
+      - cd /var/www/html/apps/user_saml/tests/integration && vendor/bin/behat
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+type: docker
+
 ---
 kind: pipeline
 name: integration-tests-stable24

.github/workflows/phpunit.yml

@@ -20,11 +20,14 @@ jobs:
       matrix:
         php-versions: ['7.4', '8.0']
         databases: ['sqlite']
-        server-versions: ['stable21', 'stable22', 'stable23', 'stable24', 'master']
+        server-versions: ['stable21', 'stable22', 'stable23', 'stable24', 'stable25', 'master']
         include:
           - php-versions: '8.1'
             server-versions: 'master'
             databases: 'sqlite'
+          - php-versions: '8.1'
+            server-versions: 'stable25'
+            databases: 'sqlite'
           - php-versions: '8.1'
             server-versions: 'stable24'
             databases: 'sqlite'