Test single matrix job

c-tanner · Sep 28, 2024 · e753dac · e753dac
1 parent e1f3cbc
commit e753dac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/.github/workflows/laravel-compatibility.yml b/.github/workflows/laravel-compatibility.yml
@@ -1,4 +1,4 @@
-name: Laravel 10/11
+name: Laravel >= 10 & PHP >= 8.2
 
 on:
   push:
@@ -16,21 +16,15 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        laravel: [10.*, 11.*]
+        laravel: [9.*, 10.*, 11.*]
+        php: [8.2, 8.3]
         dependency-version: [prefer-lowest, prefer-stable]
-        include:
-        - laravel: 10.*
-          testbench: 8.*
-          canvas: 8.*
-        - laravel: 11.*
-          testbench: 9.*
-          canvas: 9.*
     steps:
       - uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: ${{ matrix.php }}
       - name: Install dependencies
         run: |
             composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update

diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml
@@ -21,12 +21,8 @@ jobs:
         include:
         - php: 8.2
           laravel: 10.*
-          testbench: 8.*
-          canvas: 8.*
         - php: 8.3
           laravel: 11.*
-          testbench: 9.*
-          canvas: 9.*
     steps:
       - uses: actions/checkout@v4
       - name: Setup PHP
@@ -36,6 +32,6 @@ jobs:
       - name: Install dependencies
         run: |
             composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-            composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+            composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
       - name: Run tests
         run: vendor/bin/phpunit --testsuite=Feature --colors=always
diff --git a/composer.json b/composer.json
@@ -41,10 +41,10 @@
         }
     },
     "require-dev": {
-        "laravel/pint": "^1",
-        "orchestra/canvas": "^7|^8|^9.1",
-        "orchestra/testbench": "^7|^8|^9.5",
-        "phpunit/phpunit": "^9|^10|^11.3"
+        "laravel/pint": "^1.15",
+        "orchestra/canvas": "^9.1",
+        "orchestra/testbench": "^8.27",
+        "phpunit/phpunit": ">=10.5"
     },
     "scripts": {
         "post-autoload-dump": [],