Skip to content

Commit

Permalink
Merge pull request #109 from laravel-shift/l11-compatibility
Browse files Browse the repository at this point in the history
Laravel 11.x Compatibility
  • Loading branch information
freekmurze authored Mar 8, 2024
2 parents 9a6075b + d5b0d0f commit e7bc00e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,28 @@ name: run-tests

on:
push:
branches: [main]
branches:
- main
pull_request:
branches: [main]
branches:
- main

jobs:
test:
runs-on: ${{ matrix.os }}

strategy:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.2]
laravel: [10.*]
laravel: ['10.*', '11.*']
stability: [prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 11.*
testbench: 9.*

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
],
"require": {
"php": "^8.2",
"illuminate/contracts": "^10.0",
"illuminate/support": "^10.0",
"illuminate/contracts": "^10.0|^11.0",
"illuminate/support": "^10.0|^11.0",
"livewire/livewire": "^3.0",
"spatie/laravel-collection-macros": "^7.13",
"spatie/laravel-package-tools": "^1.16.1"
},
"require-dev": {
"ext-dom": "*",
"nunomaduro/collision": "^7.8.1",
"orchestra/testbench": "^8.9.1",
"nunomaduro/collision": "^7.8.1|^8.0",
"orchestra/testbench": "^8.9.1|^9.0",
"pestphp/pest": "^2.16",
"pestphp/pest-plugin-laravel": "^2.2",
"spatie/laravel-ray": "^1.32.6",
Expand Down

0 comments on commit e7bc00e

Please sign in to comment.