From 3640782d46d0e0043e96744fd1c6dc95b411749a Mon Sep 17 00:00:00 2001
From: Di <scharf.diana@googlemail.com>
Date: Fri, 15 Dec 2023 14:59:27 +0100
Subject: [PATCH] wip

---
 .github/workflows/main.yml | 59 +++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 733c0e5..c18a336 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,26 +7,44 @@ on:
     branches: [master]
 
 jobs:
-  test:
-    runs-on: ${{ matrix.os }}
+  php-tests:
+    runs-on: ubuntu-latest
+
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        php: [7.4, 8.0, 8.1]
-        laravel: [8.*, 10.*]
-        exclude:
-          - php: 7.4
-            laravel: 10.*
-          - php: 7.4
-            laravel: 9.*
+        php:
+          - '8.3'
+          - '8.2'
+          - '8.1'
+          - '8.0'
+        laravel:
+          - '10.*'
+          - '9.*'
+          - '8.*'
+        dependency-version:
+          - 'prefer-stable'
         include:
-          - laravel: 10.*
-            testbench: ^8.0
-          - laravel: 8.*
-            testbench: ^6.6
+          - laravel: '10.*'
+            php: '8.3'
+            testbench: '8.*'
+          - laravel: '10.*'
+            php: '8.2'
+            testbench: '8.*'
+          - laravel: '9.*'
+            php: '8.2'
+            testbench: '7.*'
+          - laravel: '9.*'
+            php: '8.1'
+            testbench: '7.*'
+          - laravel: '8.*'
+            php: '8.0'
+            testbench: '6.*'
+          - laravel: '8.*'
+            php: '8.1'
+            testbench: '6.*'
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.os }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ubuntu-latest
 
     steps:
       - name: Checkout code
@@ -36,18 +54,13 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
           coverage: none
 
-      - name: Setup problem matchers
-        run: |
-          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
       - name: Install dependencies
         run: |
           composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests
         run: vendor/bin/phpunit