archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1' into PHP-8.2

Browse source 
* PHP-8.1:
  Prepare for Windows CI with Github Actions
This commit is contained in:
Ilija Tovilo 2022-10-09 18:48:07 +02:00
commit 182c8acf43
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
8 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
.appveyor.yml
View file

@ -2,12 +2,7 @@ version: "{branch}.build.{build}"
image: Visual Studio 2019 image: Visual Studio 2019
branches: clone_depth: 1
except:
- PHP-5.6
- PHP-7.0
clone_depth: 64
skip_commits: skip_commits:
files: files:
@ -41,7 +36,7 @@ environment:
- THREAD_SAFE: 1 - THREAD_SAFE: 1
OPCACHE: 1 OPCACHE: 1
PARALLEL: -j2 PARALLEL: -j2
INTRINSICS: AVX INTRINSICS: AVX2
services: services:
# the setup scripts have to be touched, once some other db version is used # the setup scripts have to be touched, once some other db version is used
@ -51,10 +46,10 @@ services:
platform: platform:
- x64 - x64
# - x86 #- x86
build_script: build_script:
- appveyor\build.bat - .github\scripts\windows\build.bat
test_script: test_script:
- appveyor\test.bat - .github\scripts\windows\test.bat

1
.github/actions/configure-x64/action.yml vendored
View file

@ -72,7 +72,6 @@ runs:
--with-snmp \ --with-snmp \
--with-unixODBC \ --with-unixODBC \
--with-imap \ --with-imap \
--with-kerberos \
--with-imap-ssl \ --with-imap-ssl \
--with-pdo-odbc=unixODBC,/usr \ --with-pdo-odbc=unixODBC,/usr \
--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient \ --with-pdo-oci=shared,instantclient,/opt/oracle/instantclient \

2
.github/scripts/setup-slapd.sh vendored
View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
set -ev set -ex
# Create TLS certificate # Create TLS certificate
sudo mkdir -p /etc/ldap/ssl sudo mkdir -p /etc/ldap/ssl

2
appveyor/build.bat → .github/scripts/windows/build.bat vendored
View file

@ -38,7 +38,7 @@ if not exist "%SDK_RUNNER%" (
exit /b 3 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 if %errorlevel% neq 0 exit /b 3
exit /b 0 exit /b 0

0
appveyor/build_task.bat → .github/scripts/windows/build_task.bat vendored
View file

2
appveyor/test.bat → .github/scripts/windows/test.bat vendored
View file

@ -6,7 +6,7 @@ if not exist "%SDK_RUNNER%" (
exit /b 3 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 if %errorlevel% neq 0 exit /b 3
exit /b 0 exit /b 0

0
appveyor/test_task.bat → .github/scripts/windows/test_task.bat vendored
View file

5
ext/standard/tests/file/windows_acls/common.inc
View file

@ -16,6 +16,11 @@ function skipif() {
if(stripos(php_uname(), 'XP') !== FALSE) { if(stripos(php_uname(), 'XP') !== FALSE) {
die('skip windows 2003 or newer only test'); 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(){ function get_username(){