mirror of
https://github.com/danog/psalm-plugin-laravel.git
synced 2024-11-30 04:39:01 +01:00
fix merge conflicts
This commit is contained in:
parent
afc57c7fde
commit
a42dd252fb
13
.github/workflows/test.yml
vendored
13
.github/workflows/test.yml
vendored
@ -13,14 +13,6 @@ jobs:
|
||||
illuminate_version: [6.*, 8.*]
|
||||
stability: [prefer-lowest, prefer-stable]
|
||||
exclude:
|
||||
- php: 8.0
|
||||
stability: prefer-lowest
|
||||
- php: 8.1
|
||||
include:
|
||||
- php: 8.1
|
||||
illuminate_version: ^8.67
|
||||
stability: prefer-stable
|
||||
|
||||
# Exclude unsupported combination
|
||||
# https://laravel.com/docs/8.x/releases#support-policy
|
||||
- illuminate_version: 6.*
|
||||
@ -36,11 +28,10 @@ jobs:
|
||||
# "Added PHP 8.1 Support from v8.67.0"
|
||||
- illuminate_version: ^8.67.0
|
||||
php: 8.1
|
||||
stability: ''
|
||||
|
||||
stability: prefer-stable
|
||||
- illuminate_version: ^8.67.0
|
||||
php: 8.1
|
||||
stability: --prefer-lowest
|
||||
stability: prefer-lowest
|
||||
|
||||
name: P${{ matrix.php }} - ${{ matrix.illuminate_version }} - ${{ matrix.stability }}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user