Merge pull request #10 from gwleuverink/bump/laravel-11

Bump/laravel 11
gwleuverink · Mar 19, 2024 · d7aceba · d7aceba
2 parents bf38f2d + 5debb38
commit d7aceba
Show file tree

Hide file tree

Showing 9 changed files with 736 additions and 656 deletions.
diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml
@@ -8,35 +8,56 @@ on:
     types: [completed]
 
 jobs:
+  skip-duplicates:
+    continue-on-error: true # Uncomment once integration is finished
+    runs-on: ubuntu-latest
+
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          cancel_others: "true"
+          concurrent_skipping: "same_content"
+          skip_after_successful_duplicate: "true"
+          paths_ignore: '["**/README.md", "**/docs/**"]'
+
   browser-tests:
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.2, 8.3]
+        laravel: [^10, ^11]
+        dependency-version: [prefer-lowest, prefer-stable]
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.2"
+          php-version: ${{ matrix.php }}
           extensions: zip
-          coverage: xdebug
-
       - name: Get Composer Cache Directory
         id: composer-cache
         run: |
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Restore Composer Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-composer-
 
       - name: Install Composer dependecies
-        run: composer install --no-progress --prefer-dist --optimize-autoloader
+        run: composer update --no-progress --optimize-autoloader --${{ matrix.dependency-version }}
 
       - name: Directory Permissions
         run: sudo chown -R $(whoami) vendor/pestphp/pest/.temp vendor/orchestra

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,15 +12,13 @@ jobs:
     continue-on-error: true # Uncomment once integration is finished
     runs-on: ubuntu-latest
 
-    # Map a step output to a job output
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
 
     steps:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # All of these options are optional, so you can remove them if you are happy with the defaults
           cancel_others: "true"
           concurrent_skipping: "same_content"
           skip_after_successful_duplicate: "true"
@@ -32,14 +30,21 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.2, 8.3]
+        laravel: [^10, ^11]
+        dependency-version: [prefer-lowest, prefer-stable]
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.2"
+          php-version: ${{ matrix.php }}
           extensions: zip
           coverage: xdebug
 
@@ -49,15 +54,15 @@ jobs:
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Restore Composer Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-composer-
 
       - name: Install Composer dependecies
-        run: composer install --no-progress --prefer-dist --optimize-autoloader
+        run: composer update --no-progress --optimize-autoloader --${{ matrix.dependency-version }}
 
       - name: Directory Permissions
         run: sudo chown -R $(whoami) vendor/pestphp/pest/.temp vendor/orchestra

diff --git a/composer.json b/composer.json
@@ -30,9 +30,9 @@
     },
     "minimum-stability": "stable",
     "require": {
-        "php": "^8.0",
-        "illuminate/contracts": "^10",
-        "illuminate/support": "^10"
+        "php": "^8.1",
+        "illuminate/contracts": "^10|^11",
+        "illuminate/support": "^10|^11"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.30",
@@ -44,8 +44,8 @@
         "pestphp/pest": "^2.30",
         "spatie/laravel-ignition": "^2.3",
         "symfony/thanks": "^1.2",
-        "orchestra/testbench": "^8.19",
-        "orchestra/testbench-dusk": "^8.19",
+        "orchestra/testbench": "^8",
+        "orchestra/testbench-dusk": "^8",
         "livewire/livewire": "^3.4"
     },
     "config": {