Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/reusable-phpunit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ jobs:
DB: ${{ inputs.db-platform }}
TACHYCARDIA_MONITOR_GA: ${{ inputs.enable-profiling && 'enabled' || '' }}
TERM: xterm-256color
continue-on-error: ${{ inputs.php-version == '8.5' }}

- name: Upload coverage results as artifact
if: ${{ inputs.enable-artifact-upload }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/test-coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ jobs:
matrix:
php-version:
- '8.1'
- '8.4'
include:
- php-version: '8.5'
composer-option: '--ignore-platform-req=php'

steps:
- name: Checkout base branch for PR
Expand Down Expand Up @@ -61,7 +63,7 @@ jobs:
${{ runner.os }}-

- name: Install dependencies
run: composer update --ansi --no-interaction
run: composer update --ansi --no-interaction ${{ matrix.composer-option }}

- name: Run lint
run: composer cs
12 changes: 12 additions & 0 deletions .github/workflows/test-phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ jobs:
- '8.2'
- '8.3'
- '8.4'
include:
- php-version: '8.5'
composer-option: '--ignore-platform-req=php'

uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
with:
Expand Down Expand Up @@ -87,6 +90,7 @@ jobs:
- '8.2'
- '8.3'
- '8.4'
- '8.5'
db-platform:
- MySQLi
- OCI8
Expand All @@ -99,6 +103,8 @@ jobs:
- php-version: '8.1'
db-platform: MySQLi
mysql-version: '5.7'
- php-version: '8.5'
composer-option: '--ignore-platform-req=php'

uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
with:
Expand Down Expand Up @@ -127,6 +133,9 @@ jobs:
- '8.2'
- '8.3'
- '8.4'
include:
- php-version: '8.5'
composer-option: '--ignore-platform-req=php'

uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
with:
Expand All @@ -153,6 +162,9 @@ jobs:
- '8.2'
- '8.3'
- '8.4'
include:
- php-version: '8.5'
composer-option: '--ignore-platform-req=php'

uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
with:
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/test-psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ jobs:
build:
name: Psalm Analysis
runs-on: ubuntu-latest
if: (! contains(github.event.head_commit.message, '[ci skip]'))

strategy:
fail-fast: false
matrix:
php-version:
- '8.1'

steps:
- name: Checkout base branch for PR
Expand All @@ -39,7 +44,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: ${{ matrix.php-version }}
extensions: intl, json, mbstring, xml, mysqli, oci8, pgsql, sqlsrv, sqlite3
coverage: none
env:
Expand All @@ -66,7 +71,9 @@ jobs:
restore-keys: ${{ runner.os }}-psalm-

- name: Install dependencies
run: composer update --ansi --no-interaction
run: |
composer require sebastian/diff:^5.0 --ansi --working-dir utils
composer update --ansi --no-interaction

- name: Run Psalm analysis
run: utils/vendor/bin/psalm
13 changes: 9 additions & 4 deletions .github/workflows/test-rector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,17 @@ permissions:

jobs:
build:
name: PHP ${{ matrix.php-versions }} Analyze code (Rector)
name: PHP ${{ matrix.php-version }} Analyze code (Rector)
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
php-versions: ['8.1', '8.4']
php-version:
- '8.1'
include:
- php-version: '8.5'
composer-option: '--ignore-platform-req=php'

steps:
- name: Checkout base branch for PR
if: github.event_name == 'pull_request'
Expand All @@ -59,7 +64,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
php-version: ${{ matrix.php-version }}
extensions: intl

- name: Use latest Composer
Expand All @@ -79,7 +84,7 @@ jobs:
restore-keys: ${{ runner.os }}-composer-

- name: Install dependencies
run: composer update --ansi --no-interaction
run: composer update --ansi --no-interaction ${{ matrix.composer-option }}

- name: Rector Cache
uses: actions/cache@v4
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@
"CodeIgniter\\ComposerScripts::postUpdate"
],
"post-autoload-dump": [
"@composer update --ansi --working-dir=utils"
"@php -r \"if (PHP_VERSION_ID >= 80500) { echo '@todo Remove \"--ignore-platform-req=php\" once deps catch up.', PHP_EOL; }\"",
"@composer update --ansi --working-dir=utils --ignore-platform-req=php"
],
"analyze": [
"Composer\\Config::disableProcessTimeout",
Expand Down
Loading