Skip to content

Commit

Permalink
Laravel 11.x Compatibility (#667)
Browse files Browse the repository at this point in the history
  • Loading branch information
laravel-shift authored Feb 15, 2024
1 parent 0d70ce1 commit e52f517
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 11 deletions.
15 changes: 10 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,20 @@ env:

jobs:
tests:
name: PHP ${{ matrix.php-version }} - L${{ matrix.laravel-version }} - ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
php-version: ['8.1', '8.2']
php-version: ['8.1', '8.2', '8.3']
laravel-version: [10, 11]
os: [ubuntu-latest, windows-latest, macos-latest]
dependencies: [locked]
experimental: [false]
exclude:
- laravel-version: 11
php-version: 8.1

name: PHP ${{ matrix.php-version }} - ${{ matrix.os }}
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}

Expand All @@ -37,8 +42,8 @@ jobs:
uses: actions/cache@v2
with:
path: ${{ steps.determine-composer-cache-directory.outputs.directory }}
key: dependencies-os-${{ matrix.os }}-php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: dependencies-os-${{ matrix.os }}-php-${{ matrix.php-version }}-composer-
key: dependencies-os-${{ matrix.os }}-php-${{ matrix.php-version }}-laravel-${{ matrix.laravel-version }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: dependencies-os-${{ matrix.os }}-php-${{ matrix.php-version }}-laravel-${{ matrix.laravel-version }}-composer-

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -79,7 +84,7 @@ jobs:
command: composer install ${{ env.COMPOSER_FLAGS }}

- name: Install Laravel
run: composer require laravel/framework --no-update
run: composer require laravel/framework:${{ matrix.laravel-version }}.* --no-update

- name: Run tests
run: vendor/bin/phpunit
7 changes: 5 additions & 2 deletions .github/workflows/demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['8.1', '8.2']
laravel-version: [10]
php-version: ['8.1', '8.2', '8.3']
laravel-version: [10, 11]
os: [ubuntu-latest]
exclude:
- laravel: 11.*
php-version: 8.1

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.2'
tools: phplint, laravel/pint
- name: Check syntax
run: phplint .
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"license": "MIT",
"require": {
"doctrine/dbal": "^3.3",
"illuminate/console": "^10.0",
"illuminate/filesystem": "^10.0",
"illuminate/support": "^10.0",
"illuminate/console": "^10.0|^11.0",
"illuminate/filesystem": "^10.0|^11.0",
"illuminate/support": "^10.0|^11.0",
"laravel-shift/faker-registry": "^0.3.0",
"symfony/yaml": ">=6.2"
},
Expand Down

0 comments on commit e52f517

Please sign in to comment.