fix tests

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

Hide file tree

Showing 2 changed files with 11 additions and 34 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -19,23 +19,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['master']
-        include:
-            - php-versions: 7.4
-              databases: mysql
-              server-versions: stable21
-            - php-versions: 8.0
-              databases: mysql
-              server-versions: stable22
-            - php-versions: 8.0
-              databases: mysql
-              server-versions: stable23
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: stable24
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: master
+        server-versions: ['stable20']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -77,15 +61,17 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Start keycloak
-        run: docker-compose -f "docker-compose.integration.yml" up -d --build
+        run: |
+          docker-compose -f "docker-compose.integration.yml" up -d --build \
+            || docker compose -f "docker-compose.integration.yml" up -d --build
         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
-          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql,
+          extensions: zip, gd, mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql,
           coverage: none
 
       - name: Set up PHPUnit
@@ -119,5 +105,7 @@ jobs:
 
       - name: Stop containers
         if: always()
-        run: docker-compose -f "docker-compose.integration.yml" down
+        run: |
+          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
@@ -18,20 +18,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.3', '7.4', "8.0", "8.1"]
+        php-versions: ['7.3', '7.4']
         databases: ['mysql']
-        server-versions: ['stable21', 'stable22', 'stable23', 'stable24', 'master']
-        exclude:
-          - php-versions: 7.3
-            server-versions: master
-          - php-versions: 7.3
-            server-versions: stable24
-          - php-versions: 8.1
-            server-versions: stable21
-          - php-versions: 8.1
-            server-versions: stable22
-          - php-versions: 8.1
-            server-versions: stable23
+        server-versions: ['stable20']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}