From 6cf5c78b46c846f171d82d0063ac3118fb1714e7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Aug 2024 09:33:46 +0900 Subject: [PATCH 1/5] chore: add PHP 8.4 to test-phpunit.yml --- .github/workflows/test-phpunit.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml index ba566ce5c9d1..3ee570bb1295 100644 --- a/.github/workflows/test-phpunit.yml +++ b/.github/workflows/test-phpunit.yml @@ -59,8 +59,9 @@ jobs: - '8.1' - '8.2' - '8.3' + - '8.4' include: - - php-version: '8.3' + - php-version: '8.4' composer-option: '--ignore-platform-req=php' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo @@ -88,6 +89,7 @@ jobs: - '8.1' - '8.2' - '8.3' + - '8.4' db-platform: - MySQLi - OCI8 @@ -100,7 +102,7 @@ jobs: - php-version: '8.1' db-platform: MySQLi mysql-version: '5.7' - - php-version: '8.3' + - php-version: '8.4' composer-option: '--ignore-platform-req=php' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo @@ -129,8 +131,9 @@ jobs: - '8.1' - '8.2' - '8.3' + - '8.4' include: - - php-version: '8.3' + - php-version: '8.4' composer-option: '--ignore-platform-req=php' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo @@ -157,8 +160,9 @@ jobs: - '8.1' - '8.2' - '8.3' + - '8.4' include: - - php-version: '8.3' + - php-version: '8.4' composer-option: '--ignore-platform-req=php' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo From 01ddd2c34945fb6c25479174d67f91e9e100da2b Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Aug 2024 09:43:58 +0900 Subject: [PATCH 2/5] chore: add continue-on-error --- .github/workflows/test-phpunit.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml index 3ee570bb1295..bd13e73fe89f 100644 --- a/.github/workflows/test-phpunit.yml +++ b/.github/workflows/test-phpunit.yml @@ -63,6 +63,7 @@ jobs: include: - php-version: '8.4' composer-option: '--ignore-platform-req=php' + continue-on-error: true uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -104,6 +105,7 @@ jobs: mysql-version: '5.7' - php-version: '8.4' composer-option: '--ignore-platform-req=php' + continue-on-error: true uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -135,6 +137,7 @@ jobs: include: - php-version: '8.4' composer-option: '--ignore-platform-req=php' + continue-on-error: true uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -164,6 +167,7 @@ jobs: include: - php-version: '8.4' composer-option: '--ignore-platform-req=php' + continue-on-error: true uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: From 452b792327e46b0ffacb3167d2ae4156a8e43896 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Aug 2024 09:56:09 +0900 Subject: [PATCH 3/5] chore: remove duplicated 8.4 --- .github/workflows/test-phpunit.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml index bd13e73fe89f..59f285d2c747 100644 --- a/.github/workflows/test-phpunit.yml +++ b/.github/workflows/test-phpunit.yml @@ -59,7 +59,6 @@ jobs: - '8.1' - '8.2' - '8.3' - - '8.4' include: - php-version: '8.4' composer-option: '--ignore-platform-req=php' @@ -90,7 +89,6 @@ jobs: - '8.1' - '8.2' - '8.3' - - '8.4' db-platform: - MySQLi - OCI8 @@ -133,7 +131,6 @@ jobs: - '8.1' - '8.2' - '8.3' - - '8.4' include: - php-version: '8.4' composer-option: '--ignore-platform-req=php' @@ -163,7 +160,6 @@ jobs: - '8.1' - '8.2' - '8.3' - - '8.4' include: - php-version: '8.4' composer-option: '--ignore-platform-req=php' From 296c5a509119d20618b84b954380739e2e790cda Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Aug 2024 10:22:14 +0900 Subject: [PATCH 4/5] chore: add "--ignore-platform-req=php" temporarily Error: Your requirements could not be resolved to an installable set of packages. Problem 1 - vimeo/psalm[5.0.0, ..., 5.13.1] require php ^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 -> your php version (8.4.0-dev) does not satisfy that requirement. - vimeo/psalm[5.14.0, ..., 5.25.0] require php ^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 -> your php version (8.4.0-dev) does not satisfy that requirement. - Root composer.json requires vimeo/psalm ^5.0 -> satisfiable by vimeo/psalm[5.0.0, ..., 5.25.0]. Script @composer update --working-dir=utils handling the post-autoload-dump event returned with error code 2 Error: Process completed with exit code 2. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 303f15bd1ce8..c778e029f5dc 100644 --- a/composer.json +++ b/composer.json @@ -88,7 +88,7 @@ "CodeIgniter\\ComposerScripts::postUpdate" ], "post-autoload-dump": [ - "@composer update --working-dir=utils" + "@composer update --working-dir=utils --ignore-platform-req=php" ], "analyze": [ "Composer\\Config::disableProcessTimeout", From 312ffa0ae6bbc3744c33cf531d52285cb9e4a4c4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 22 Aug 2024 08:20:18 +0900 Subject: [PATCH 5/5] chore: move continue-on-error to reusable-phpunit-test.yml --- .github/workflows/reusable-phpunit-test.yml | 1 + .github/workflows/test-phpunit.yml | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/reusable-phpunit-test.yml b/.github/workflows/reusable-phpunit-test.yml index 84ade1d08862..c5ee92e7a70c 100644 --- a/.github/workflows/reusable-phpunit-test.yml +++ b/.github/workflows/reusable-phpunit-test.yml @@ -203,6 +203,7 @@ jobs: DB: ${{ inputs.db-platform }} TACHYCARDIA_MONITOR_GA: ${{ inputs.enable-profiling && 'enabled' || '' }} TERM: xterm-256color + continue-on-error: ${{ inputs.php-version == '8.4' }} - name: Upload coverage results as artifact if: ${{ inputs.enable-artifact-upload }} diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml index 59f285d2c747..349a4b658ec2 100644 --- a/.github/workflows/test-phpunit.yml +++ b/.github/workflows/test-phpunit.yml @@ -62,7 +62,6 @@ jobs: include: - php-version: '8.4' composer-option: '--ignore-platform-req=php' - continue-on-error: true uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -103,7 +102,6 @@ jobs: mysql-version: '5.7' - php-version: '8.4' composer-option: '--ignore-platform-req=php' - continue-on-error: true uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -134,7 +132,6 @@ jobs: include: - php-version: '8.4' composer-option: '--ignore-platform-req=php' - continue-on-error: true uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -163,7 +160,6 @@ jobs: include: - php-version: '8.4' composer-option: '--ignore-platform-req=php' - continue-on-error: true uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: