Skip to content

Commit 48e612b

Browse files
authored
Merge pull request #232 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents 094d1d1 + 5bb2e58 commit 48e612b

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

.github/workflows/ci.yml

+13-17
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ name: CI
33
on:
44
push:
55
branches:
6-
- "*"
6+
- *
77
tags:
8-
- "*"
8+
- *
99
pull_request:
1010
branches:
11-
- "*"
11+
- *
1212

1313
jobs:
1414
build:
@@ -17,27 +17,23 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
php:
21-
- "8.1"
22-
- "8.2"
23-
- "8.3"
24-
- "8.4"
25-
laravel:
26-
- 10.*
27-
- 11.*
28-
prefer:
29-
- "prefer-lowest"
30-
- "prefer-stable"
20+
php: ['8.1', '8.2', '8.3', '8.4']
21+
laravel: ['10.*', '11.*', '12.*']
22+
prefer: [prefer-lowest, prefer-stable]
3123
include:
3224
- laravel: 10.*
3325
testbench: 8.*
3426
- laravel: 11.*
3527
testbench: 9.*
28+
- laravel: 12.*
29+
testbench: 10.*
3630
exclude:
37-
- php: "8.1"
31+
- php: '8.1'
3832
laravel: 11.*
39-
- php: "8.4"
33+
- php: '8.4'
4034
laravel: 10.*
35+
- laravel: 12.*
36+
php: '8.1'
4137

4238
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} --${{ matrix.prefer }}
4339

@@ -70,4 +66,4 @@ jobs:
7066
- uses: codecov/[email protected]
7167
with:
7268
fail_ci_if_error: false
73-
file: "*.xml"
69+
file: *.xml

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
}
2121
],
2222
"require": {
23-
"illuminate/database": "^10.5|^11.33",
24-
"illuminate/support": "^10.5|^11.33"
23+
"illuminate/database": "^10.5|^11.33|^12.0",
24+
"illuminate/support": "^10.5|^11.33|^12.0"
2525
},
2626
"autoload": {
2727
"psr-4": {
@@ -41,7 +41,7 @@
4141
"laravel/legacy-factories": "^1.4",
4242
"livewire/livewire": "dev-main",
4343
"mockery/mockery": "^1.6",
44-
"orchestra/testbench": "^8.1.1|^9",
44+
"orchestra/testbench": "^8.1.1|^9|^10.0",
4545
"phpunit/phpunit": "^9.5.25|^10|^11"
4646
},
4747
"config": {

0 commit comments

Comments
 (0)