Commit 40ae629

committed

Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1: Windows CI log verbosity, CI bat file guard

2 parents 6343975 + f42e562 commit 40ae629Copy full SHA for 40ae629

File tree

+20

-0

lines changed

+20

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`@echo off`
`2`	`2`
	`3`	`+if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (`
	`4`	`+ echo for CI only`
	`5`	`+ exit /b 3`
	`6`	`+)`
	`7`	`+`
`3`	`8`	`set SDK_REMOTE=https://github.com/php/php-sdk-binary-tools.git`
`4`	`9`	`set SDK_BRANCH=%PHP_BUILD_SDK_BRANCH%`
`5`	`10`	`set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-%PHP_BUILD_CRT%-%PLATFORM%.bat`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`@echo off`
`2`	`2`
	`3`	`+if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (`
	`4`	`+ echo for CI only`
	`5`	`+ exit /b 3`
	`6`	`+)`
	`7`	`+`
`3`	`8`	`if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin >NUL 2>NUL`
`4`	`9`	`if %errorlevel% neq 0 exit /b 3`
`5`	`10`	`if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin64 >NUL 2>NUL`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`@echo off`
`2`	`2`
	`3`	`+if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (`
	`4`	`+ echo for CI only`
	`5`	`+ exit /b 3`
	`6`	`+)`
	`7`	`+`
`3`	`8`	`set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-%PHP_BUILD_CRT%-%PLATFORM%.bat`
`4`	`9`	`if not exist "%SDK_RUNNER%" (`
`5`	`10`	`echo "%SDK_RUNNER%" doesn't exist`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`@echo off`
`2`	`2`
	`3`	`+if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (`
	`4`	`+ echo for CI only`
	`5`	`+ exit /b 3`
	`6`	`+)`
	`7`	`+`
`3`	`8`	`set NO_INTERACTION=1`
`4`	`9`	`set REPORT_EXIT_STATUS=1`
`5`	`10`	`set SKIP_IO_CAPTURE_TESTS=1`

Comments

(0)