Skip to content

Commit dde1d9e

Browse files
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Retire AppVeyor
2 parents 61a49ae + 80153c9 commit dde1d9e

File tree

9 files changed

+8
-104
lines changed

9 files changed

+8
-104
lines changed

.appveyor.yml

-56
This file was deleted.

.github/scripts/windows/build.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22

3-
if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
3+
if /i "%GITHUB_ACTIONS%" neq "True" (
44
echo for CI only
55
exit /b 3
66
)

.github/scripts/windows/build_task.bat

+1-19
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,10 @@
11
@echo off
22

3-
if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
3+
if /i "%GITHUB_ACTIONS%" neq "True" (
44
echo for CI only
55
exit /b 3
66
)
77

8-
if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin >NUL 2>NUL
9-
if %errorlevel% neq 0 exit /b 3
10-
if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin64 >NUL 2>NUL
11-
if %errorlevel% neq 0 exit /b 3
12-
if "%APPVEYOR%" equ "True" rmdir /s /q C:\mingw >NUL 2>NUL
13-
if %errorlevel% neq 0 exit /b 3
14-
if "%APPVEYOR%" equ "True" rmdir /s /q C:\mingw-w64 >NUL 2>NUL
15-
if %errorlevel% neq 0 exit /b 3
16-
if "%APPVEYOR%" equ "True" rmdir /s /q C:\msys64 >NUL 2>NUL
17-
if %errorlevel% neq 0 exit /b 3
18-
if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-Win32 >NUL 2>NUL
19-
if %errorlevel% neq 0 exit /b 3
20-
if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-Win64 >NUL 2>NUL
21-
if %errorlevel% neq 0 exit /b 3
22-
if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-v11-Win32 >NUL 2>NUL
23-
if %errorlevel% neq 0 exit /b 3
24-
if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-v11-Win64 >NUL 2>NUL
25-
if %errorlevel% neq 0 exit /b 3
268
del /f /q C:\Windows\System32\libcrypto-1_1-x64.dll >NUL 2>NUL
279
if %errorlevel% neq 0 exit /b 3
2810
del /f /q C:\Windows\System32\libssl-1_1-x64.dll >NUL 2>NUL

.github/scripts/windows/test.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22

3-
if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
3+
if /i "%GITHUB_ACTIONS%" neq "True" (
44
echo for CI only
55
exit /b 3
66
)

.github/scripts/windows/test_task.bat

+4-23
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22

3-
if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
3+
if /i "%GITHUB_ACTIONS%" neq "True" (
44
echo for CI only
55
exit /b 3
66
)
@@ -32,11 +32,7 @@ set PDO_MYSQL_TEST_PASS=%MYSQL_PWD%
3232
set PDO_MYSQL_TEST_HOST=%MYSQL_TEST_HOST%
3333
set PDO_MYSQL_TEST_PORT=%MYSQL_TEST_PORT%
3434
set PDO_MYSQL_TEST_DSN=mysql:host=%PDO_MYSQL_TEST_HOST%;port=%PDO_MYSQL_TEST_PORT%;dbname=test
35-
if /i "%APPVEYOR%" equ "True" (
36-
set TMP_MYSQL_BIN=%ProgramFiles%\MySql\MySQL Server 5.7\bin
37-
) else (
38-
set TMP_MYSQL_BIN=C:\mysql\bin
39-
)
35+
set TMP_MYSQL_BIN=C:\mysql\bin
4036
"%TMP_MYSQL_BIN%\mysql.exe" --host=%PDO_MYSQL_TEST_HOST% --port=%MYSQL_TEST_PORT% --user=%MYSQL_TEST_USER% --password=%MYSQL_TEST_PASSWD% -e "CREATE DATABASE IF NOT EXISTS test"
4137
if %errorlevel% neq 0 exit /b 3
4238

@@ -46,22 +42,14 @@ set PGPASSWORD=Password12!
4642
rem set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!
4743
echo ^<?php $conn_str = "host=127.0.0.1 dbname=test port=5432 user=%PGUSER% password=%PGPASSWORD%"; ?^> >> "./ext/pgsql/tests/config.inc"
4844
set PDO_PGSQL_TEST_DSN=pgsql:host=127.0.0.1 port=5432 dbname=test user=%PGUSER% password=%PGPASSWORD%
49-
if /i "%APPVEYOR%" equ "True" (
50-
set TMP_POSTGRESQL_BIN=%ProgramFiles%\PostgreSQL\10\bin
51-
) else (
52-
set TMP_POSTGRESQL_BIN=%PGBIN%
53-
)
45+
set TMP_POSTGRESQL_BIN=%PGBIN%
5446
"%TMP_POSTGRESQL_BIN%\createdb.exe" test
5547
if %errorlevel% neq 0 exit /b 3
5648

5749
rem setup ODBC related exts
5850
set ODBC_TEST_USER=sa
5951
set ODBC_TEST_PASS=Password12!
60-
if /i "%APPVEYOR%" equ "True" (
61-
set ODBC_TEST_DSN=Driver={ODBC Driver 13 for SQL Server};Server=^(local^)\SQL2017;Database=master;uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
62-
) else (
63-
set ODBC_TEST_DSN=Driver={ODBC Driver 17 for SQL Server};Server=^(local^)\SQLEXPRESS;Database=master;uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
64-
)
52+
set ODBC_TEST_DSN=Driver={ODBC Driver 17 for SQL Server};Server=^(local^)\SQLEXPRESS;Database=master;uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
6553
set PDOTEST_DSN=odbc:%ODBC_TEST_DSN%
6654

6755
rem setup Firebird related exts
@@ -159,11 +147,4 @@ if %EXIT_CODE% GEQ 1 (
159147
git diff > bless_tests.patch
160148
)
161149

162-
if /i "%APPVEYOR%" equ "True" (
163-
appveyor PushArtifact %TEST_PHP_JUNIT%
164-
if %EXIT_CODE% GEQ 1 (
165-
appveyor PushArtifact bless_tests.patch
166-
)
167-
)
168-
169150
exit /b %EXIT_CODE%

CONTRIBUTING.md

-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ locations.
167167
├─ zend_vm_opcodes.c # Generated by `Zend/zend_vm_gen.php`
168168
├─ zend_vm_opcodes.h # Generated by `Zend/zend_vm_gen.php`
169169
└─ ...
170-
├─ appveyor/ # Appveyor CI service files
171170
└─ build/ # *nix build system files
172171
├─ ax_*.m4 # https://github.com/autoconf-archive/autoconf-archive
173172
├─ config.guess # https://git.savannah.gnu.org/cgit/config.git

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ blog to the most popular websites in the world. PHP is distributed under the
1616

1717
[![Push](https://github.com/php/php-src/actions/workflows/push.yml/badge.svg)](https://github.com/php/php-src/actions/workflows/push.yml)
1818
[![Build status](https://travis-ci.com/php/php-src.svg?branch=master)](https://travis-ci.com/github/php/php-src)
19-
[![Build status](https://ci.appveyor.com/api/projects/status/meyur6fviaxgdwdy/branch/master?svg=true)](https://ci.appveyor.com/project/php/php-src)
2019
[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/php.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:php)
2120

2221
## Documentation

docs/release-process.md

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ releases.
5656
3. Ensure that the relevant tests on CI are green.
5757

5858
- https://travis-ci.com/github/php/php-src
59-
- https://ci.appveyor.com/project/php/php-src
6059
- https://cirrus-ci.com/github/php/php-src
6160
- https://github.com/php/php-src/actions
6261

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function skipif() {
1919
if (getenv('GITHUB_ACTIONS')) {
2020
// bug44859_4.phpt test fails on the 1st run
2121
// other ACL tests cannot be run twice
22-
die('skip failing on Github Actions (but passes in AppVeyor)');
22+
die('skip failing on Github Actions');
2323
}
2424
}
2525

0 commit comments

Comments
 (0)