Skip to content

Commit a1d4b18

Browse files
committed
Merge branch 'PHP-8.4'
2 parents c9249e2 + cb49400 commit a1d4b18

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

‎.github/workflows/nightly.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ on:
3232
windows_version:
3333
required: true
3434
type: string
35+
vs_crt_version:
36+
required: true
37+
type: string
3538
skip_laravel:
3639
required: true
3740
type: boolean
@@ -1034,7 +1037,7 @@ jobs:
10341037
PHP_BUILD_OBJ_DIR: C:\obj
10351038
PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
10361039
PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
1037-
PHP_BUILD_CRT: ${{ inputs.windows_version == '2022' && 'vs17' || 'vs16' }}
1040+
PHP_BUILD_CRT: ${{ inputs.vs_crt_version }}
10381041
PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
10391042
THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
10401043
INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"

‎.github/workflows/root.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
(((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 5) || matrix.branch.version[0] >= 9) && '24.04')
6161
|| '22.04' }}
6262
windows_version: '2022'
63+
vs_crt_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) && 'vs17') || 'vs16' }}
6364
skip_laravel: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
6465
skip_symfony: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
6566
skip_wordpress: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}

0 commit comments

Comments
 (0)