From 4ce05db2e9c2de47be22b164f21af90881915567 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sun, 12 Jan 2025 14:51:33 +0100 Subject: [PATCH] Attempt a debug build in CI We also switch to /Z7 to avoid some build flakyness. --- .github/scripts/windows/build_task.bat | 3 +++ .github/workflows/push.yml | 9 +++++---- win32/build/confutils.js | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/scripts/windows/build_task.bat b/.github/scripts/windows/build_task.bat index fd9a956bd38fb..0484d3fc829b5 100644 --- a/.github/scripts/windows/build_task.bat +++ b/.github/scripts/windows/build_task.bat @@ -37,6 +37,9 @@ set CFLAGS=/W1 /WX /w14013 cmd /c configure.bat ^ --enable-snapshot-build ^ --disable-debug-pack ^ + --enable-debug ^ + --disable-cli-win32 ^ + --disable-phpdbgs ^ --without-analyzer ^ --enable-object-out-dir=%PHP_BUILD_OBJ_DIR% ^ --with-php-build=%DEPS_DIR% ^ diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 4705b8874dd05..a89c9a6503cd3 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -41,7 +41,7 @@ env: CXX: ccache g++ jobs: LINUX_X64: - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: false services: mysql: image: mysql:8.3 @@ -137,7 +137,7 @@ jobs: if: ${{ !matrix.asan }} uses: ./.github/actions/verify-generated-files LINUX_X32: - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: false name: LINUX_X32_DEBUG_ZTS runs-on: ubuntu-latest timeout-minutes: 50 @@ -193,7 +193,7 @@ jobs: -d zend_extension=opcache.so -d opcache.enable_cli=1 MACOS_DEBUG_NTS: - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: false strategy: fail-fast: false matrix: @@ -264,7 +264,7 @@ jobs: run: .github/scripts/windows/test.bat BENCHMARKING: name: BENCHMARKING - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: false runs-on: ubuntu-24.04 timeout-minutes: 50 steps: @@ -371,6 +371,7 @@ jobs: retention-days: 30 FREEBSD: name: FREEBSD + if: false runs-on: ubuntu-latest steps: - name: git checkout diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 27c70f9efc1c9..c47976bf7756a 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3702,7 +3702,7 @@ function toolset_setup_build_mode() { if (PHP_DEBUG == "yes") { ADD_FLAG("CFLAGS", "/LDd /MDd /Od /U NDebug /U NDEBUG /D ZEND_DEBUG=1 " + - (TARGET_ARCH == 'x86'?"/ZI":"/Zi")); + ("/Z7")); ADD_FLAG("LDFLAGS", "/debug"); // Avoid problems when linking to release libraries that use the release // version of the libc