Skip to content

Commit 2d0a125

Browse files
committed
Merge branch 'release/v1.4.1'
2 parents da6271b + 41e0bcf commit 2d0a125

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

.github/workflows/test.yml

+12-2
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212

1313
env:
1414
latest_php: 8.4
15-
latest_laravel: 11
15+
latest_laravel: 12
1616

1717
strategy:
1818
fail-fast: false
1919
matrix:
2020
os: [ ubuntu-latest ]
2121
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
22-
laravel: [ 6, 7, 8, 9, 10, 11 ]
22+
laravel: [ 6, 7, 8, 9, 10, 11, 12 ]
2323
exclude:
2424
- php: 7.2
2525
laravel: 8
@@ -29,28 +29,38 @@ jobs:
2929
laravel: 10
3030
- php: 7.2
3131
laravel: 11
32+
- php: 7.2
33+
laravel: 12
3234
- php: 7.3
3335
laravel: 9
3436
- php: 7.3
3537
laravel: 10
3638
- php: 7.3
3739
laravel: 11
40+
- php: 7.3
41+
laravel: 12
3842
- php: 7.4
3943
laravel: 9
4044
- php: 7.4
4145
laravel: 10
4246
- php: 7.4
4347
laravel: 11
48+
- php: 7.4
49+
laravel: 12
4450
- php: 8.0
4551
laravel: 10
4652
- php: 8.0
4753
laravel: 11
54+
- php: 8.0
55+
laravel: 12
4856
- php: 8.1
4957
laravel: 6
5058
- php: 8.1
5159
laravel: 7
5260
- php: 8.1
5361
laravel: 11
62+
- php: 8.1
63+
laravel: 12
5464
- php: 8.2
5565
laravel: 6
5666
- php: 8.2

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
],
1313
"require": {
1414
"php": "^7.2 || ^8.0",
15-
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0"
15+
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0"
1616
},
1717
"require-dev": {
18-
"orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
18+
"orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
1919
},
2020
"autoload": {
2121
"psr-4": {

0 commit comments

Comments
 (0)