Skip to content

Unify Windows CI log verbosity with linux #10817

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.

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

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 0 deletions .github/scripts/windows/build.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
@echo off

if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
echo for CI only
exit /b 3
)

set SDK_REMOTE=https://github.com/php/php-sdk-binary-tools.git
set SDK_BRANCH=%PHP_BUILD_SDK_BRANCH%
set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-%PHP_BUILD_CRT%-%PLATFORM%.bat
Expand Down
5 changes: 5 additions & 0 deletions .github/scripts/windows/build_task.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
@echo off

if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
echo for CI only
exit /b 3
)

if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin >NUL 2>NUL
if %errorlevel% neq 0 exit /b 3
if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin64 >NUL 2>NUL
Expand Down
5 changes: 5 additions & 0 deletions .github/scripts/windows/test.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
@echo off

if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
echo for CI only
exit /b 3
)

set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-%PHP_BUILD_CRT%-%PLATFORM%.bat
if not exist "%SDK_RUNNER%" (
echo "%SDK_RUNNER%" doesn't exist
Expand Down
7 changes: 6 additions & 1 deletion .github/scripts/windows/test_task.bat
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ popd
set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release
if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS

if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
echo for CI only
exit /b 3
)

mkdir %PHP_BUILD_DIR%\test_file_cache
rem generate php.ini
echo extension_dir=%PHP_BUILD_DIR% > %PHP_BUILD_DIR%\php.ini
Expand All @@ -119,7 +124,7 @@ mkdir c:\tests_tmp

set TEST_PHP_JUNIT=c:\junit.out.xml

nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp --bless %PARALLEL%"
nmake test TESTS="%OPCACHE_OPTS% -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP -q --offline --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp --bless %PARALLEL%"

set EXIT_CODE=%errorlevel%

Expand Down