Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into 5.next-enum-validation
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.lock
  • Loading branch information
dereuromark committed Jul 2, 2024
2 parents 745ae9e + ad1b88e commit 8ae3409
Show file tree
Hide file tree
Showing 69 changed files with 3,431 additions and 867 deletions.
23 changes: 13 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
Expand All @@ -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') }}
Expand All @@ -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') }}
Expand All @@ -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

Expand Down
Loading

0 comments on commit 8ae3409

Please sign in to comment.