fix tests

Signed-off-by: Julien Veyssier <[email protected]>
nextcloud · Mar 10, 2025 · 2711726 · 2711726
1 parent fb8936b
commit 2711726
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 56 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -20,29 +20,7 @@ jobs:
       matrix:
         php-versions: ['8.1']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['master']
-        include:
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: stable25
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: stable26
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: stable27
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: stable28
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: master
-            - php-versions: 8.2
-              databases: mysql
-              server-versions: master
-            - php-versions: 8.3
-              databases: mysql
-              server-versions: master
+        server-versions: ['stable25']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -90,7 +68,7 @@ jobs:
         working-directory: apps/${{ env.APP_NAME }}/tests/
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2.12.0
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit
@@ -130,6 +108,6 @@ jobs:
       - name: Stop containers
         if: always()
         run: |
-          docker-compose -f "docker-compose.integration.yml" down
+          docker-compose -f "docker-compose.integration.yml" down \
             || docker compose -f "docker-compose.integration.yml" down
         working-directory: apps/${{ env.APP_NAME }}/tests/
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -21,37 +21,7 @@ jobs:
       matrix:
         php-versions: ['7.4', '8.0', '8.1']
         databases: ['mysql']
-        server-versions: ['stable25', 'stable26', 'stable27', 'stable28', 'master']
-        exclude:
-          - php-versions: 7.4
-            server-versions: master
-          - php-versions: 7.4
-            server-versions: stable28
-          - php-versions: 7.4
-            server-versions: stable27
-          - php-versions: 7.4
-            server-versions: stable26
-          - php-versions: 8.0
-            server-versions: master
-        include:
-          - php-versions: 8.2
-            databases: mysql
-            server-versions: stable26
-          - php-versions: 8.2
-            databases: mysql
-            server-versions: stable27
-          - php-versions: 8.2
-            databases: mysql
-            server-versions: stable28
-          - php-versions: 8.3
-            databases: mysql
-            server-versions: stable28
-          - php-versions: 8.2
-            databases: mysql
-            server-versions: master
-          - php-versions: 8.3
-            databases: mysql
-            server-versions: master
+        server-versions: ['stable25']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}