Skip to content

Commit 182c8ac

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Prepare for Windows CI with Github Actions
2 parents 22db5aa + 296a095 commit 182c8ac

File tree

8 files changed

+13
-14
lines changed

8 files changed

+13
-14
lines changed

.appveyor.yml

+5-10
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@ version: "{branch}.build.{build}"
22

33
image: Visual Studio 2019
44

5-
branches:
6-
except:
7-
- PHP-5.6
8-
- PHP-7.0
9-
10-
clone_depth: 64
5+
clone_depth: 1
116

127
skip_commits:
138
files:
@@ -41,7 +36,7 @@ environment:
4136
- THREAD_SAFE: 1
4237
OPCACHE: 1
4338
PARALLEL: -j2
44-
INTRINSICS: AVX
39+
INTRINSICS: AVX2
4540

4641
services:
4742
# the setup scripts have to be touched, once some other db version is used
@@ -51,10 +46,10 @@ services:
5146

5247
platform:
5348
- x64
54-
# - x86
49+
#- x86
5550

5651
build_script:
57-
- appveyor\build.bat
52+
- .github\scripts\windows\build.bat
5853

5954
test_script:
60-
- appveyor\test.bat
55+
- .github\scripts\windows\test.bat

.github/actions/configure-x64/action.yml

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ runs:
7272
--with-snmp \
7373
--with-unixODBC \
7474
--with-imap \
75-
--with-kerberos \
7675
--with-imap-ssl \
7776
--with-pdo-odbc=unixODBC,/usr \
7877
--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient \

.github/scripts/setup-slapd.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
set -ev
2+
set -ex
33

44
# Create TLS certificate
55
sudo mkdir -p /etc/ldap/ssl

appveyor/build.bat .github/scripts/windows/build.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if not exist "%SDK_RUNNER%" (
3838
exit /b 3
3939
)
4040

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
4242
if %errorlevel% neq 0 exit /b 3
4343

4444
exit /b 0
File renamed without changes.

appveyor/test.bat .github/scripts/windows/test.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if not exist "%SDK_RUNNER%" (
66
exit /b 3
77
)
88

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
1010
if %errorlevel% neq 0 exit /b 3
1111

1212
exit /b 0
File renamed without changes.

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

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ function skipif() {
1616
if(stripos(php_uname(), 'XP') !== FALSE) {
1717
die('skip windows 2003 or newer only test');
1818
}
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+
}
1924
}
2025

2126
function get_username(){

0 commit comments

Comments
 (0)