-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into 5.next-enum-validation
# Conflicts: # composer.lock
- Loading branch information
Showing
69 changed files
with
3,431 additions
and
867 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,10 +11,10 @@ jobs: | |
strategy: | ||
fail-fast: false | ||
matrix: | ||
php-version: ['8.1', '8.3'] | ||
php-version: ['8.2', '8.3'] | ||
db-type: [sqlite, mysql, pgsql] | ||
include: | ||
- php-version: '8.1' | ||
- php-version: '8.2' | ||
db-type: 'sqlite' | ||
|
||
services: | ||
|
@@ -26,7 +26,7 @@ jobs: | |
POSTGRES_PASSWORD: postgres | ||
|
||
steps: | ||
- uses: actions/checkout@v3 | ||
- uses: actions/checkout@v4 | ||
|
||
- name: Setup Service | ||
if: matrix.db-type == 'mysql' | ||
|
@@ -46,7 +46,7 @@ jobs: | |
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT | ||
|
||
- name: Cache dependencies | ||
uses: actions/cache@v3 | ||
uses: actions/cache@v4 | ||
with: | ||
path: ${{ steps.composercache.outputs.dir }} | ||
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} | ||
|
@@ -66,36 +66,36 @@ jobs: | |
if [[ ${{ matrix.db-type }} == 'sqlite' ]]; then export DB_URL='sqlite:///:memory:'; fi | ||
if [[ ${{ matrix.db-type }} == 'mysql' ]]; then export DB_URL='mysql://root:[email protected]/cakephp'; fi | ||
if [[ ${{ matrix.db-type }} == 'pgsql' ]]; then export DB_URL='postgres://postgres:[email protected]/postgres'; fi | ||
if [[ ${{ matrix.php-version }} == '8.1' && ${{ matrix.db-type }} == 'mysql' ]]; then | ||
if [[ ${{ matrix.php-version }} == '8.2' && ${{ matrix.db-type }} == 'mysql' ]]; then | ||
vendor/bin/phpunit --coverage-clover=coverage.xml --coverage-text | ||
else | ||
vendor/bin/phpunit | ||
fi | ||
- name: Code Coverage Report | ||
if: success() && matrix.php-version == '8.1' && matrix.db-type == 'mysql' | ||
if: success() && matrix.php-version == '8.2' && matrix.db-type == 'mysql' | ||
uses: codecov/codecov-action@v1 | ||
|
||
validation: | ||
name: Coding Standard & Static Analysis | ||
runs-on: ubuntu-22.04 | ||
|
||
steps: | ||
- uses: actions/checkout@v3 | ||
- uses: actions/checkout@v4 | ||
|
||
- name: Setup PHP | ||
uses: shivammathur/setup-php@v2 | ||
with: | ||
php-version: '8.1' | ||
extensions: mbstring, intl | ||
php-version: '8.2' | ||
extensions: mbstring, intl, pdo_sqlite | ||
coverage: none | ||
|
||
- name: Get composer cache directory | ||
id: composercache | ||
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT | ||
|
||
- name: Cache dependencies | ||
uses: actions/cache@v3 | ||
uses: actions/cache@v4 | ||
with: | ||
path: ${{ steps.composercache.outputs.dir }} | ||
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} | ||
|
@@ -104,6 +104,9 @@ jobs: | |
- name: Prepare config | ||
run: cp config/app_local.ci.php config/app_local.php | ||
|
||
- name: Prepare DB | ||
run: export DB_URL='sqlite:///:memory:' | ||
|
||
- name: Composer install | ||
run: composer install --no-progress --prefer-dist --optimize-autoloader | ||
|
||
|
Oops, something went wrong.