Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Windows x86 CI (just checking) #15361

Closed
wants to merge 8 commits into from
Closed

Windows x86 CI (just checking) #15361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cc3cc79
Windows x86 CI
cmb69 Aug 12, 2024
e516f2d
Enable debug assertions
cmb69 Aug 12, 2024
b746290
com_safearray_proxy
cmb69 Aug 13, 2024
d8bff15
Revert "com_safearray_proxy"
cmb69 Aug 21, 2024
e9d74d2
Revert "Enable debug assertions"
cmb69 Aug 21, 2024
4cb4d6e
Support --enable-debug-assertions configure option
cmb69 Aug 21, 2024
d219520
--enable-debug-assertions
cmb69 Aug 21, 2024
00e202d
fix
cmb69 Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/scripts/windows/build_task.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ if /i "%GITHUB_ACTIONS%" neq "True" (
exit /b 3
)

del /f /q C:\Windows\System32\libcrypto-1_1-x64.dll >NUL 2>NUL
del /f /q C:\Windows\System32\libcrypto-1_1-x86.dll >NUL 2>NUL
if %errorlevel% neq 0 exit /b 3
del /f /q C:\Windows\System32\libssl-1_1-x64.dll >NUL 2>NUL
del /f /q C:\Windows\System32\libssl-1_1-x86.dll >NUL 2>NUL
if %errorlevel% neq 0 exit /b 3

call %~dp0find-target-branch.bat
Expand Down Expand Up @@ -40,6 +40,7 @@ if "%PLATFORM%" == "x86" (

cmd /c configure.bat ^
--enable-snapshot-build ^
--enable-debug-assertions ^
--disable-debug-pack ^
--enable-com-dotnet=shared ^
--without-analyzer ^
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,15 @@ 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
env:
PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
PHP_BUILD_OBJ_DIR: C:\obj
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
Expand Down
4 changes: 4 additions & 0 deletions win32/build/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ ARG_ENABLE('debug-pack', 'Release binaries with external debug symbols (--enable
if (PHP_DEBUG == "yes" && PHP_DEBUG_PACK == "yes") {
ERROR("Use of both --enable-debug and --enable-debug-pack not allowed.");
}
ARG_ENABLE('debug-assertions', 'Release binaries with debug assertions (--enable-debug must not be specified)', "no");
if (PHP_DEBUG == "yes" && PHP_DEBUG_ASSERTIONS == "yes") {
ERROR("Use of both --enable-debug and --enable-debug-assertions not allowed.");
}

if (PHP_DEBUG == "yes") {
ADD_FLAG("CFLAGS"," /Wall ");
Expand Down
11 changes: 8 additions & 3 deletions win32/build/confutils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ can be built that way. \
var snapshot_build_exclusions = new Array(
'debug', 'lzf-better-compression', 'php-build', 'snapshot-template', 'zts',
'ipv6', 'fd-setsize', 'pgi', 'pgo', 'all-shared', 'config-profile', 'sanitizer',
'phpdbg-debug'
'phpdbg-debug', 'debug-assertions'
);
var force;

Expand Down Expand Up @@ -3473,10 +3473,15 @@ function toolset_setup_build_mode()
}
ADD_FLAG("CFLAGS", "/LD /MD");
if (PHP_SANITIZER == "yes" && CLANG_TOOLSET) {
ADD_FLAG("CFLAGS", "/Od /D NDebug /D NDEBUG /D ZEND_WIN32_NEVER_INLINE /D ZEND_DEBUG=0");
ADD_FLAG("CFLAGS", "/Od /D NDebug /D NDEBUG /D ZEND_WIN32_NEVER_INLINE");
} else {
// Equivalent to Release_TSInline build -> best optimization
ADD_FLAG("CFLAGS", "/Ox /D NDebug /D NDEBUG /GF /D ZEND_DEBUG=0");
ADD_FLAG("CFLAGS", "/Ox /D NDebug /D NDEBUG /GF");
}
if (PHP_DEBUG_ASSERTIONS == "yes") {
ADD_FLAG("CFLAGS", "/D ZEND_DEBUG=1");
} else {
ADD_FLAG("CFLAGS", "/D ZEND_DEBUG=0");
}

// if you have VS.Net /GS hardens the binary against buffer overruns
Expand Down
2 changes: 1 addition & 1 deletion win32/winutil.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ PHP_WINUTIL_API BOOL php_win32_crt_compatible(char **err)
{/*{{{*/
#if PHP_LINKER_MAJOR == 14
/* Extend for other CRT if needed. */
# if PHP_DEBUG
# if _DEBUG
const char *crt_name = "vcruntime140d.dll";
# else
const char *crt_name = "vcruntime140.dll";
Expand Down
Loading