From dd674bf0529a191e53475ba451ed9c6f7fce9486 Mon Sep 17 00:00:00 2001 From: Saki Takamachi Date: Wed, 25 Sep 2024 11:00:05 +0900 Subject: [PATCH 1/2] CI prepare for PHP-8.4 --- .github/scripts/windows/find-target-branch.bat | 2 +- .github/workflows/nightly.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/scripts/windows/find-target-branch.bat b/.github/scripts/windows/find-target-branch.bat index 77d1684048142..a0b47f2488946 100644 --- a/.github/scripts/windows/find-target-branch.bat +++ b/.github/scripts/windows/find-target-branch.bat @@ -3,6 +3,6 @@ for /f "usebackq tokens=3" %%i in (`findstr PHP_MAJOR_VERSION main\php_version.h`) do set BRANCH=%%i for /f "usebackq tokens=3" %%i in (`findstr PHP_MINOR_VERSION main\php_version.h`) do set BRANCH=%BRANCH%.%%i -if /i "%BRANCH%" equ "8.4" ( +if /i "%BRANCH%" equ "8.5" ( set BRANCH=master ) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0d3a2de34c3f3..52156df16be80 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -422,6 +422,7 @@ jobs: - { branch: { name: 'PHP-8.1', ref: 'PHP-8.1', major: 8, minor: 1 }, type: 'verify_type_inference' } - { branch: { name: 'PHP-8.2', ref: 'PHP-8.2', major: 8, minor: 2 }, type: 'verify_type_inference' } - { branch: { name: 'PHP-8.3', ref: 'PHP-8.3', major: 8, minor: 3 }, type: 'verify_type_inference' } + - { branch: { name: 'PHP-8.4', ref: 'PHP-8.4', major: 8, minor: 4 }, type: 'verify_type_inference' } name: "${{ matrix.branch.name }}_COMMUNITY_${{ matrix.type }}" runs-on: ubuntu-${{ matrix.branch.version.minor >= 3 && '22.04' || '20.04' }} env: From 57e658c7d2ec1e590aa4aaa9db4276625bce825e Mon Sep 17 00:00:00 2001 From: Saki Takamachi Date: Wed, 25 Sep 2024 20:28:45 +0900 Subject: [PATCH 2/2] removed 8.4 exclude --- .github/workflows/nightly.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 52156df16be80..0d3a2de34c3f3 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -422,7 +422,6 @@ jobs: - { branch: { name: 'PHP-8.1', ref: 'PHP-8.1', major: 8, minor: 1 }, type: 'verify_type_inference' } - { branch: { name: 'PHP-8.2', ref: 'PHP-8.2', major: 8, minor: 2 }, type: 'verify_type_inference' } - { branch: { name: 'PHP-8.3', ref: 'PHP-8.3', major: 8, minor: 3 }, type: 'verify_type_inference' } - - { branch: { name: 'PHP-8.4', ref: 'PHP-8.4', major: 8, minor: 4 }, type: 'verify_type_inference' } name: "${{ matrix.branch.name }}_COMMUNITY_${{ matrix.type }}" runs-on: ubuntu-${{ matrix.branch.version.minor >= 3 && '22.04' || '20.04' }} env: