Skip to content

Commit af8ef4c

Browse files
committed
Update Windows CI to build with vs17
PHP 8.4 is supposed to be built with vs17 (aka. Visual Studio 2022)[1], so we also do this for CI. We mark gh8841.phpt as xfail for known reasons. [1] <https://windows.php.net/>
1 parent d5c4522 commit af8ef4c

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

.github/workflows/nightly.yml

+2-2
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-2019
886+
runs-on: windows-2022
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: vs16
892+
PHP_BUILD_CRT: vs17
893893
PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
894894
THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
895895
INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"

.github/workflows/push.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -236,13 +236,13 @@ jobs:
236236
WINDOWS:
237237
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
238238
name: WINDOWS_X64_ZTS
239-
runs-on: windows-2019
239+
runs-on: windows-2022
240240
env:
241241
PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
242242
PHP_BUILD_OBJ_DIR: C:\obj
243243
PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
244244
PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
245-
PHP_BUILD_CRT: vs16
245+
PHP_BUILD_CRT: vs17
246246
PLATFORM: x64
247247
THREAD_SAFE: "1"
248248
INTRINSICS: AVX2

Zend/tests/gh8841.phpt

+11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
--TEST--
22
GH-8841 (php-cli core dump calling a badly formed function)
3+
--SKIPIF--
4+
<?php
5+
$tracing = extension_loaded("Zend OPcache")
6+
&& ($conf = opcache_get_configuration()["directives"])
7+
&& array_key_exists("opcache.jit", $conf)
8+
&& $conf["opcache.jit"] === "tracing";
9+
if (PHP_OS_FAMILY === "Windows" && PHP_INT_SIZE == 8 && $tracing) {
10+
$url = "https://github.com/php/php-src/pull/14919#issuecomment-2259003979";
11+
die("xfail Test fails on Windows x64 (VS17) and tracing JIT; see $url");
12+
}
13+
?>
314
--FILE--
415
<?php
516
register_shutdown_function(function() {

0 commit comments

Comments
 (0)