From 25e6cde1ffcbe6e975bbaffa42b60dbcdcec7344 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 2 Oct 2024 12:50:52 +0200 Subject: [PATCH 1/3] x86 builds on Windows are warning level 1 clean The only issue that was left was due to the old build of net-snmp 5.7.3; since updating to net-snmp 5.9.4, this is resolved. --- .github/scripts/windows/build_task.bat | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/scripts/windows/build_task.bat b/.github/scripts/windows/build_task.bat index e8d84b8c0bfd6..ec4ce4459d088 100644 --- a/.github/scripts/windows/build_task.bat +++ b/.github/scripts/windows/build_task.bat @@ -31,12 +31,7 @@ if %errorlevel% neq 0 exit /b 3 if "%THREAD_SAFE%" equ "0" set ADD_CONF=%ADD_CONF% --disable-zts if "%INTRINSICS%" neq "" set ADD_CONF=%ADD_CONF% --enable-native-intrinsics=%INTRINSICS% -rem Some undefined behavior is reported on 32-bit, this should be fixed -if "%PLATFORM%" == "x86" ( - set CFLAGS=/W1 -) else ( - set CFLAGS=/W1 /WX -) +set CFLAGS=/W1 /WX cmd /c configure.bat ^ --enable-snapshot-build ^ From eea3e22816c019442b6141b914b1e39a7c533edd Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 2 Oct 2024 12:52:10 +0200 Subject: [PATCH 2/3] Temporarily verify x86 build on Windows --- .github/workflows/push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d014047d150c7..ed29dcf52202e 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -226,7 +226,7 @@ jobs: uses: ./.github/actions/verify-generated-files WINDOWS: if: github.repository == 'php/php-src' || github.event_name == 'pull_request' - name: WINDOWS_X64_ZTS + name: WINDOWS_X86_ZTS runs-on: windows-2022 timeout-minutes: 50 env: @@ -235,7 +235,7 @@ jobs: PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0 PHP_BUILD_CRT: vs17 - PLATFORM: x64 + PLATFORM: x86 THREAD_SAFE: "1" INTRINSICS: AVX2 PARALLEL: -j2 From 5384c488c32f3ffbacc1c7731e470dbdb83a6c34 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 2 Oct 2024 13:37:19 +0200 Subject: [PATCH 3/3] [skip ci] Revert "Temporarily verify x86 build on Windows" This reverts commit eea3e22816c019442b6141b914b1e39a7c533edd. --- .github/workflows/push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index ed29dcf52202e..d014047d150c7 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -226,7 +226,7 @@ jobs: uses: ./.github/actions/verify-generated-files WINDOWS: if: github.repository == 'php/php-src' || github.event_name == 'pull_request' - name: WINDOWS_X86_ZTS + name: WINDOWS_X64_ZTS runs-on: windows-2022 timeout-minutes: 50 env: @@ -235,7 +235,7 @@ jobs: PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0 PHP_BUILD_CRT: vs17 - PLATFORM: x86 + PLATFORM: x64 THREAD_SAFE: "1" INTRINSICS: AVX2 PARALLEL: -j2