Skip to content

Commit f42e562

Browse files
mvorisekiluuu1994
authored andcommitted
Windows CI log verbosity, CI bat file guard
Closes GH-10817
1 parent 471105a commit f42e562

File tree

4 files changed

+21
-1
lines changed

4 files changed

+21
-1
lines changed

.github/scripts/windows/build.bat

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
@echo off
22

3+
if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
4+
echo for CI only
5+
exit /b 3
6+
)
7+
38
set SDK_REMOTE=https://github.com/php/php-sdk-binary-tools.git
49
set SDK_BRANCH=%PHP_BUILD_SDK_BRANCH%
510
set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-%PHP_BUILD_CRT%-%PLATFORM%.bat

.github/scripts/windows/build_task.bat

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
@echo off
22

3+
if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
4+
echo for CI only
5+
exit /b 3
6+
)
7+
38
if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin >NUL 2>NUL
49
if %errorlevel% neq 0 exit /b 3
510
if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin64 >NUL 2>NUL

.github/scripts/windows/test.bat

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
@echo off
22

3+
if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
4+
echo for CI only
5+
exit /b 3
6+
)
7+
38
set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-%PHP_BUILD_CRT%-%PLATFORM%.bat
49
if not exist "%SDK_RUNNER%" (
510
echo "%SDK_RUNNER%" doesn't exist

.github/scripts/windows/test_task.bat

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
@echo off
22

3+
if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
4+
echo for CI only
5+
exit /b 3
6+
)
7+
38
set NO_INTERACTION=1
49
set REPORT_EXIT_STATUS=1
510
set SKIP_IO_CAPTURE_TESTS=1
@@ -119,7 +124,7 @@ mkdir c:\tests_tmp
119124

120125
set TEST_PHP_JUNIT=c:\junit.out.xml
121126

122-
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%"
127+
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%"
123128

124129
set EXIT_CODE=%errorlevel%
125130

0 commit comments

Comments
 (0)