Skip to content

Commit 26bd0c4

Browse files
committed
remove CI changes
1 parent bf45553 commit 26bd0c4

2 files changed

Lines changed: 1 addition & 36 deletions

File tree

.github/scripts/windows/build_task.bat

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,12 @@ if %errorlevel% neq 0 exit /b 3
2626
if "%THREAD_SAFE%" equ "0" set ADD_CONF=%ADD_CONF% --disable-zts
2727
if "%INTRINSICS%" neq "" set ADD_CONF=%ADD_CONF% --enable-native-intrinsics=%INTRINSICS%
2828
if "%ASAN%" equ "1" set ADD_CONF=%ADD_CONF% --enable-sanitizer --enable-debug-pack
29-
if "%CLANG_TOOLSET%" equ "1" set ADD_CONF=%ADD_CONF% --with-toolset=clang
3029

3130
rem C4018: comparison: signed/unsigned mismatch
3231
rem C4146: unary minus operator applied to unsigned type
3332
rem C4244: type conversion, possible loss of data
3433
rem C4267: 'size_t' type conversion, possible loss of data
35-
if "%CLANG_TOOLSET%" equ "1" (
36-
rem Clang is much stricter than MSVC, produces too many warnings that would fail the build with /WX
37-
set CFLAGS=/W3 /wd4018 /wd4146 /wd4244 /wd4267
38-
) else (
39-
set CFLAGS=/W3 /WX /wd4018 /wd4146 /wd4244 /wd4267
40-
)
34+
set CFLAGS=/W3 /WX /wd4018 /wd4146 /wd4244 /wd4267
4135

4236
cmd /c configure.bat ^
4337
--enable-snapshot-build ^

.github/workflows/test-suite.yml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -962,35 +962,6 @@ jobs:
962962
run: .github/scripts/windows/build.bat
963963
- name: Test
964964
run: .github/scripts/windows/test.bat
965-
WINDOWS_CLANG:
966-
if: ${{ fromJson(inputs.branch).jobs.WINDOWS }}
967-
name: "WINDOWS_X64_ZTS_CLANG"
968-
runs-on: windows-2022
969-
env:
970-
PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
971-
PHP_BUILD_OBJ_DIR: C:\obj
972-
PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
973-
PHP_BUILD_SDK_BRANCH: php-sdk-2.5.0
974-
PHP_BUILD_CRT: ${{ fromJson(inputs.branch).jobs.WINDOWS.config.vs_crt_version }}
975-
PLATFORM: x64
976-
THREAD_SAFE: "1"
977-
INTRINSICS: "AVX2"
978-
PARALLEL: -j2
979-
OPCACHE: "1"
980-
CLANG_TOOLSET: "1"
981-
steps:
982-
- name: git config
983-
run: git config --global core.autocrlf false && git config --global core.eol lf
984-
- name: git checkout
985-
uses: actions/checkout@v6
986-
with:
987-
ref: ${{ fromJson(inputs.branch).ref }}
988-
- name: Setup
989-
uses: ./.github/actions/setup-windows
990-
- name: Build
991-
run: .github/scripts/windows/build.bat
992-
- name: Test
993-
run: .github/scripts/windows/test.bat
994965
FREEBSD:
995966
if: ${{ fromJson(inputs.branch).jobs.FREEBSD }}
996967
strategy:

0 commit comments

Comments
 (0)