Skip to content

Commit

Permalink
Laravel 10 Support (#270)
Browse files Browse the repository at this point in the history
* Start Laravel update

* Update coverage

* Change back to 8.1

* Update to PHP 8.2 again

* Exclude Laravel 10 with PHP 8.0

* Add documentation and manually update carbon
  • Loading branch information
ArlonAntonius committed Feb 14, 2023
1 parent 1276834 commit 99b767c
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
runs-on: ubuntu-latest

env:
PHP_VERSION: '8.1'
PHP_VERSION: '8.2'
DB_VERSION: '8'
LARAVEL_VERSION: '9.*'
LARAVEL_VERSION: '10.*'
DEPENDENCY_VERSION: 'prefer-stable'

steps:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['8.0', '8.1']
laravel: [9.*]
php: ['8.0', '8.1', '8.2']
laravel: [9.*, 10.*]
service: ['5.7', '8']
dependency-version: [prefer-lowest, prefer-stable]
exclude:
# Laravel 10 does not support PHP 8.0
- php: '8.0'
laravel: 10.*

name: 'PHP ${{ matrix.php }} / Laravel: ${{ matrix.laravel }} / ${{ matrix.dependency-version }} / MySQL ${{ matrix.service }}'

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"keywords": ["laravel", "multi-tenant", "saas", "tenancy", "aws", "gce"],
"license": "MIT",
"require": {
"laravel/framework": "^9.0",
"laravel/framework": "^9.0 | ^10.0",
"doctrine/dbal": "^3.3"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion src/Tenancy/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"keywords": ["laravel", "multi-tenant", "saas", "tenancy", "aws", "gce"],
"license": "MIT",
"require": {
"laravel/framework": "^9.0"
"laravel/framework": "^9.0 | ^10.0"
},
"autoload": {
"psr-4": {
Expand Down
1 change: 1 addition & 0 deletions test
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ done
RUNCOMMAND="composer require 'laravel/framework:$LARAVEL_VERSION' --no-interaction --no-update"
RUNCOMMAND="${RUNCOMMAND} && composer require 'laravel/laravel:$LARAVEL_VERSION' --dev --no-interaction --no-update"
RUNCOMMAND="${RUNCOMMAND} && composer update --no-ansi --no-interaction --$DEPENDENCY_VERSIONS"
RUNCOMMAND="${RUNCOMMAND} && composer update --no-ansi --no-interaction nesbot/carbon"
RUNCOMMAND="${RUNCOMMAND} && /ops/wait-for-it.sh mysql:3306 --timeout=120 && $PHPUNIT_PREPEND vendor/bin/phpunit $PHPUNIT_APPEND"

echo "${RUNCOMMAND}"
Expand Down

0 comments on commit 99b767c

Please sign in to comment.