Skip to content

Commit 2832b42

Browse files
authored
Fix nightly Windows builds regarding CRT and runners (GH-15273)
Only the master branch should use vs17; older branches still should stick with vs16. And while not strictly necessary, older branches should better stick with windows-2019 runners.
1 parent 2190353 commit 2832b42

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -883,13 +883,13 @@ jobs:
883883
matrix:
884884
include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.windows-matrix-include) }}
885885
name: "${{ matrix.branch.name }}_WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
886-
runs-on: windows-2022
886+
runs-on: ${{ (matrix.branch.version.minor >= 4) && 'windows-2022' || 'windows-2019' }}
887887
env:
888888
PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
889889
PHP_BUILD_OBJ_DIR: C:\obj
890890
PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
891891
PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
892-
PHP_BUILD_CRT: vs17
892+
PHP_BUILD_CRT: ${{ (matrix.branch.version.minor >= 4) && 'vs17' || 'vs16' }}
893893
PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
894894
THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
895895
INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"

0 commit comments

Comments
 (0)