From b5f8fac61ac3b237a2cc077bf825520c78cb19c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Thu, 9 Mar 2023 21:08:27 +0100 Subject: [PATCH 1/3] Unify Windows CI log verbosity --- .github/scripts/windows/test_task.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/windows/test_task.bat b/.github/scripts/windows/test_task.bat index bca81878527e6..60f940ed5c5b2 100644 --- a/.github/scripts/windows/test_task.bat +++ b/.github/scripts/windows/test_task.bat @@ -119,7 +119,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,BORK,LEAK,XLEAK --no-progress -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% From 511c207dcec1edcac0e85ff89eaced72b9b1fd9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Thu, 9 Mar 2023 21:11:02 +0100 Subject: [PATCH 2/3] Prevent Windows CI bat files to be run locally --- .github/scripts/windows/build.bat | 5 +++++ .github/scripts/windows/build_task.bat | 5 +++++ .github/scripts/windows/test.bat | 5 +++++ .github/scripts/windows/test_task.bat | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/.github/scripts/windows/build.bat b/.github/scripts/windows/build.bat index 5f29baefabad0..9aec8f5c2b791 100644 --- a/.github/scripts/windows/build.bat +++ b/.github/scripts/windows/build.bat @@ -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 diff --git a/.github/scripts/windows/build_task.bat b/.github/scripts/windows/build_task.bat index dde252d2ef7c2..166712675ae5f 100644 --- a/.github/scripts/windows/build_task.bat +++ b/.github/scripts/windows/build_task.bat @@ -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 diff --git a/.github/scripts/windows/test.bat b/.github/scripts/windows/test.bat index 24ee260464fde..7e2b869db8c1f 100644 --- a/.github/scripts/windows/test.bat +++ b/.github/scripts/windows/test.bat @@ -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 diff --git a/.github/scripts/windows/test_task.bat b/.github/scripts/windows/test_task.bat index 60f940ed5c5b2..205b46229d2e5 100644 --- a/.github/scripts/windows/test_task.bat +++ b/.github/scripts/windows/test_task.bat @@ -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 From 2d7d394361b6cd56db34dd612e3807dcde0c3cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Thu, 9 Mar 2023 21:27:21 +0100 Subject: [PATCH 3/3] unify verbosity with linux --- .github/scripts/windows/test_task.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/windows/test_task.bat b/.github/scripts/windows/test_task.bat index 205b46229d2e5..fe8b55824041f 100644 --- a/.github/scripts/windows/test_task.bat +++ b/.github/scripts/windows/test_task.bat @@ -124,7 +124,7 @@ mkdir c:\tests_tmp set TEST_PHP_JUNIT=c:\junit.out.xml -nmake test TESTS="%OPCACHE_OPTS% -g FAIL,BORK,LEAK,XLEAK --no-progress -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%