move AppVeyor scripts to .github/

mvorisek · mvorisek · commit c37298c8e24a · 2022-09-30T18:24:41.000+02:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -2,12 +2,7 @@ version: "{branch}.build.{build}"
 
 image: Visual Studio 2019
 
-branches:
-        except:
-                - PHP-5.6
-                - PHP-7.0
-
-clone_depth: 64
+clone_depth: 1
 
 skip_commits:
   files:
@@ -51,10 +46,10 @@ services:
 
 platform:
         - x64
-          #        - x86
+        #- x86
 
 build_script:
-        - appveyor\build.bat
+        - .github\scripts\windows\build.bat
 
 test_script:
-        - appveyor\test.bat
+        - .github\scripts\windows\test.bat
diff --git a/.github/scripts/windows/build.bat b/.github/scripts/windows/build.bat
@@ -38,7 +38,7 @@ if not exist "%SDK_RUNNER%" (
 	exit /b 3
 )
 
-cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\build_task.bat
+cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\.github\scripts\windows\build_task.bat
 if %errorlevel% neq 0 exit /b 3
 
 exit /b 0
diff --git a/.github/scripts/windows/build_task.bat b/.github/scripts/windows/build_task.bat
diff --git a/.github/scripts/windows/test.bat b/.github/scripts/windows/test.bat
@@ -6,7 +6,7 @@ if not exist "%SDK_RUNNER%" (
 	exit /b 3
 )
 
-cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\test_task.bat
+cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\.github\scripts\windows\test_task.bat
 if %errorlevel% neq 0 exit /b 3
 
 exit /b 0
diff --git a/.github/scripts/windows/test_task.bat b/.github/scripts/windows/test_task.bat
diff --git a/buildconf.bat b/buildconf.bat
@@ -1,4 +1,5 @@
 @echo off
+
 cscript /nologo /e:jscript win32\build\buildconf.js %*
 SET PHP_BUILDCONF_PATH=%~dp0
 copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > nul
diff --git a/ext/standard/tests/file/windows_acls/common.inc b/ext/standard/tests/file/windows_acls/common.inc
@@ -16,6 +16,11 @@ function skipif() {
     if(stripos(php_uname(), 'XP') !== FALSE) {
         die('skip windows 2003 or newer only test');
     }
+    if (getenv('GITHUB_ACTIONS')) {
+        // bug44859_4.phpt test fails on the 1st run
+        // other ACL tests cannot be run twice
+        die('skip failing on Github Actions (but passes in AppVeyor)');
+    }
 }
 
 function get_username(){
diff --git a/win32/build/configure.bat b/win32/build/configure.bat
@@ -1,2 +1,3 @@
 @echo off
+
 cscript /nologo /e:jscript configure.js %*
diff --git a/win32/build/phpize.bat b/win32/build/phpize.bat
@@ -1,4 +1,5 @@
 @echo off
+
 SET PHP_BUILDCONF_PATH=%~dp0
 cscript /nologo /e:jscript %PHP_BUILDCONF_PATH%\script\phpize.js %*
 IF NOT EXIST configure.bat (

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ if not exist "%SDK_RUNNER%" (`
`38`	`38`	`exit /b 3`
`39`	`39`	`)`
`40`	`40`
`41`		`-cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\build_task.bat`
	`41`	`+cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\.github\scripts\windows\build_task.bat`
`42`	`42`	`if %errorlevel% neq 0 exit /b 3`
`43`	`43`
`44`	`44`	`exit /b 0`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ if not exist "%SDK_RUNNER%" (`
`6`	`6`	`exit /b 3`
`7`	`7`	`)`
`8`	`8`
`9`		`-cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\test_task.bat`
	`9`	`+cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\.github\scripts\windows\test_task.bat`
`10`	`10`	`if %errorlevel% neq 0 exit /b 3`
`11`	`11`
`12`	`12`	`exit /b 0`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`@echo off`
	`2`	`+`
`2`	`3`	`cscript /nologo /e:jscript win32\build\buildconf.js %*`
`3`	`4`	`SET PHP_BUILDCONF_PATH=%~dp0`
`4`	`5`	`copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > nul`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,11 @@ function skipif() {`
`16`	`16`	`if(stripos(php_uname(), 'XP') !== FALSE) {`
`17`	`17`	`die('skip windows 2003 or newer only test');`
`18`	`18`	`}`
	`19`	`+ if (getenv('GITHUB_ACTIONS')) {`
	`20`	`+ // bug44859_4.phpt test fails on the 1st run`
	`21`	`+ // other ACL tests cannot be run twice`
	`22`	`+ die('skip failing on Github Actions (but passes in AppVeyor)');`
	`23`	`+ }`
`19`	`24`	`}`
`20`	`25`
`21`	`26`	`function get_username(){`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`@echo off`
	`2`	`+`
`2`	`3`	`cscript /nologo /e:jscript configure.js %*`