Merge branch 'PHP-8.2'

* PHP-8.2: Retire AppVeyor
2024-09-21 09:57:23 +00:00 · 2023-07-05 15:17:11 +02:00 · 2023-07-05 15:17:11 +02:00 · dde1d9e102
commit dde1d9e102
parent 61a49ae841 80153c9c2b
9 changed files with 8 additions and 104 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,56 +0,0 @@
-version: "{branch}.build.{build}"
-
-image: Visual Studio 2019
-
-clone_depth: 1
-
-skip_commits:
-  files:
-    - docs/*
-    - NEWS
-    - UPGRADING
-    - UPGRADING.INTERNALS
-
-cache:
-        - c:\build-cache
-
-environment:
-        PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
-        PHP_BUILD_OBJ_DIR: c:\obj
-        PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
-        PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
-        PHP_BUILD_CRT: vs16
-        # ext and env setup for tests
-        #MYSQL_TEST_PASSWD: Password12!
-        #MYSQL_TEST_USER: root
-        #PDO_MYSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=root password=Password12!"
-        #PDO_MYSQL_TEST_USER: root
-        #PDO_MYSQL_TEST_PASS: Password12!
-        #PGSQL_TEST_CONNSTR: "host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!"
-        #PDO_PGSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=postgres password=Password12!"
-        STACK_LIMIT_DEFAULTS_CHECK: 1
-        #build permutations
-        matrix:
-                - THREAD_SAFE: 0
-                  OPCACHE: 0
-                  PARALLEL: -j2
-                - THREAD_SAFE: 1
-                  OPCACHE: 1
-                  PARALLEL: -j2
-                  INTRINSICS: AVX2
-
-services:
-        # the setup scripts have to be touched, once some other db version is used
-        - mysql
-        - postgresql101
-        - mssql2017
-
-platform:
-        - x64
-        #- x86
-
-build_script:
-        - .github\scripts\windows\build.bat
-
-test_script:
-        - .github\scripts\windows\test.bat
--- a/.github/scripts/windows/build.bat
+++ b/.github/scripts/windows/build.bat
@ -1,6 +1,6 @@
@echo off

-if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
+if /i "%GITHUB_ACTIONS%" neq "True" (
    echo for CI only
    exit /b 3
 )
--- a/.github/scripts/windows/build_task.bat
+++ b/.github/scripts/windows/build_task.bat
@ -1,28 +1,10 @@
@echo off

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

-if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\mingw >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\mingw-w64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\msys64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-Win32 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-Win64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-v11-Win32 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-v11-Win64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
 del /f /q C:\Windows\System32\libcrypto-1_1-x64.dll >NUL 2>NUL
 if %errorlevel% neq 0 exit /b 3
 del /f /q C:\Windows\System32\libssl-1_1-x64.dll >NUL 2>NUL
--- a/.github/scripts/windows/test.bat
+++ b/.github/scripts/windows/test.bat
@ -1,6 +1,6 @@
@echo off

-if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
+if /i "%GITHUB_ACTIONS%" neq "True" (
    echo for CI only
    exit /b 3
 )
--- a/.github/scripts/windows/test_task.bat
+++ b/.github/scripts/windows/test_task.bat
@ -1,6 +1,6 @@
@echo off

-if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
+if /i "%GITHUB_ACTIONS%" neq "True" (
    echo for CI only
    exit /b 3
 )
@ -32,11 +32,7 @@ set PDO_MYSQL_TEST_PASS=%MYSQL_PWD%
 set PDO_MYSQL_TEST_HOST=%MYSQL_TEST_HOST%
 set PDO_MYSQL_TEST_PORT=%MYSQL_TEST_PORT%
 set PDO_MYSQL_TEST_DSN=mysql:host=%PDO_MYSQL_TEST_HOST%;port=%PDO_MYSQL_TEST_PORT%;dbname=test
-if /i "%APPVEYOR%" equ "True" (
-    set TMP_MYSQL_BIN=%ProgramFiles%\MySql\MySQL Server 5.7\bin
-) else (
-    set TMP_MYSQL_BIN=C:\mysql\bin
-)
+set TMP_MYSQL_BIN=C:\mysql\bin
 "%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"
 if %errorlevel% neq 0 exit /b 3

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

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

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

-if /i "%APPVEYOR%" equ "True" (
-	appveyor PushArtifact %TEST_PHP_JUNIT%
-	if %EXIT_CODE% GEQ 1 (
-		appveyor PushArtifact bless_tests.patch
-	)
-)
-
 exit /b %EXIT_CODE%
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -167,7 +167,6 @@ locations.
    ├─ zend_vm_opcodes.c            # Generated by `Zend/zend_vm_gen.php`
    ├─ zend_vm_opcodes.h            # Generated by `Zend/zend_vm_gen.php`
    └─ ...
- ├─ appveyor/                       # Appveyor CI service files
 └─ build/                          # *nix build system files
    ├─ ax_*.m4                      # https://github.com/autoconf-archive/autoconf-archive
    ├─ config.guess                 # https://git.savannah.gnu.org/cgit/config.git
--- a/README.md
+++ b/README.md
@ -16,7 +16,6 @@ blog to the most popular websites in the world. PHP is distributed under the

 [![Push](https://github.com/php/php-src/actions/workflows/push.yml/badge.svg)](https://github.com/php/php-src/actions/workflows/push.yml)
 [![Build status](https://travis-ci.com/php/php-src.svg?branch=master)](https://travis-ci.com/github/php/php-src)
-[![Build status](https://ci.appveyor.com/api/projects/status/meyur6fviaxgdwdy/branch/master?svg=true)](https://ci.appveyor.com/project/php/php-src)
 [![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)

 ## Documentation
--- a/docs/release-process.md
+++ b/docs/release-process.md
@ -56,7 +56,6 @@ releases.
 3. Ensure that the relevant tests on CI are green.

   - https://travis-ci.com/github/php/php-src
-   - https://ci.appveyor.com/project/php/php-src
   - https://cirrus-ci.com/github/php/php-src
   - https://github.com/php/php-src/actions

--- a/ext/standard/tests/file/windows_acls/common.inc
+++ b/ext/standard/tests/file/windows_acls/common.inc
@ -19,7 +19,7 @@ function skipif() {
    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)');
+        die('skip failing on Github Actions');
    }
 }