Skip to content

Prepare for Windows CI with Github Actions #9595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -41,7 +36,7 @@ environment:
- THREAD_SAFE: 1
OPCACHE: 1
PARALLEL: -j2
INTRINSICS: AVX
INTRINSICS: AVX2

services:
# the setup scripts have to be touched, once some other db version is used
Expand All @@ -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
1 change: 0 additions & 1 deletion .github/actions/configure-x64/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ runs:
--with-snmp \
--with-unixODBC \
--with-imap \
--with-kerberos \
--with-imap-ssl \
--with-pdo-odbc=unixODBC,/usr \
--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient \
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/setup-slapd.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
set -ev
set -ex

# Create TLS certificate
sudo mkdir -p /etc/ldap/ssl
Expand Down
2 changes: 1 addition & 1 deletion appveyor/build.bat → .github/scripts/windows/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
2 changes: 1 addition & 1 deletion appveyor/test.bat → .github/scripts/windows/test.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
5 changes: 5 additions & 0 deletions ext/standard/tests/file/windows_acls/common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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(){
Expand Down