From f47dc259aafa8b77bbe35e91977c0335e84c88be Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Fri, 30 Jun 2023 13:14:32 +0200 Subject: [PATCH] Retire AppVeyor Closes GH-11566 --- .appveyor.yml | 55 ------------------- .github/scripts/windows/build.bat | 2 +- .github/scripts/windows/build_task.bat | 20 +------ .github/scripts/windows/test.bat | 2 +- .github/scripts/windows/test_task.bat | 27 ++------- CONTRIBUTING.md | 1 - README.md | 1 - docs/release-process.md | 1 - .../tests/file/windows_acls/common.inc | 2 +- 9 files changed, 8 insertions(+), 103 deletions(-) delete mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 7567578af25..00000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,55 +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!" - #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 diff --git a/.github/scripts/windows/build.bat b/.github/scripts/windows/build.bat index 9aec8f5c2b7..ebe08c86b5e 100644 --- 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 ) diff --git a/.github/scripts/windows/build_task.bat b/.github/scripts/windows/build_task.bat index 166712675ae..e8d84b8c0bf 100644 --- 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 diff --git a/.github/scripts/windows/test.bat b/.github/scripts/windows/test.bat index 7e2b869db8c..510e9bc78f4 100644 --- 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 ) diff --git a/.github/scripts/windows/test_task.bat b/.github/scripts/windows/test_task.bat index e9ed59c8175..57103d3158c 100644 --- 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 ^ >> "./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 prepare for ext/openssl @@ -133,11 +121,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% diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index df7d66809ab..0b25d24086c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -140,7 +140,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 diff --git a/README.md b/README.md index cda88fb4e75..03f8a64edac 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ blog to the most popular websites in the world. PHP is distributed under the [PHP License v3.01](LICENSE). [![Build status](https://travis-ci.com/php/php-src.svg?branch=master)](https://travis-ci.com/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) [![Build Status](https://dev.azure.com/phpazuredevops/php/_apis/build/status/php.php-src?branchName=master)](https://dev.azure.com/phpazuredevops/php/_build/latest?definitionId=1&branchName=master) [![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) diff --git a/docs/release-process.md b/docs/release-process.md index e4a2281fce9..4e543300d4b 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -31,7 +31,6 @@ explained at the end of this document in See: - https://travis-ci.com/github/php/php-src - - https://ci.appveyor.com/project/php/php-src - https://dev.azure.com/phpazuredevops/PHP/ - https://cirrus-ci.com/github/php/php-src diff --git a/ext/standard/tests/file/windows_acls/common.inc b/ext/standard/tests/file/windows_acls/common.inc index 8e69d23b35a..024989a9333 100644 --- 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'); } }