From 1b0e76c32ca937b102a70f8098b0dd68f701044d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 29 Jun 2021 13:40:53 +0200 Subject: [PATCH 1/2] Add support/testing for PHP 8.1 --- data/supported-extensions | 76 +++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/data/supported-extensions b/data/supported-extensions index 4571e0f..30f1aab 100644 --- a/data/supported-extensions +++ b/data/supported-extensions @@ -2,38 +2,38 @@ amqp 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 apcu 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 apcu_bc 7.0 7.1 7.2 7.3 7.4 ast 7.0 7.1 7.2 7.3 7.4 8.0 -bcmath 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -bz2 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -calendar 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +bcmath 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +bz2 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +calendar 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 cmark 7.0 7.1 7.2 7.3 7.4 csv 7.3 7.4 8.0 -dba 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +dba 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 decimal 7.0 7.1 7.2 7.3 7.4 8.0 ds 7.0 7.1 7.2 7.3 7.4 8.0 -enchant 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +enchant 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 ev 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 excimer 7.1 7.2 7.3 7.4 8.0 -exif 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -ffi 7.4 8.0 -gd 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +exif 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +ffi 7.4 8.0 8.1 +gd 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 gearman 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 geoip 5.5 5.6 7.0 7.1 7.2 7.3 7.4 geospatial 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -gettext 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +gettext 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 gmagick 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -gmp 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +gmp 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 gnupg 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 grpc 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 http 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 igbinary 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 imagick 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -imap 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +imap 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 inotify 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 interbase 5.5 5.6 7.0 7.1 7.2 7.3 -intl 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +intl 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 ioncube_loader 5.5 5.6 7.0 7.1 7.2 7.3 7.4 -json_post 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -ldap 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +json_post 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +ldap 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 lzf 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 mailparse 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 maxminddb 7.2 7.3 7.4 8.0 @@ -46,60 +46,60 @@ mosquitto 5.5 5.6 7.0 7.1 7.2 7.3 7.4 msgpack 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 mssql 5.5 5.6 mysql 5.5 5.6 -mysqli 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +mysqli 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 oauth 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -oci8 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -odbc 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -opcache 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +oci8 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +odbc 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +opcache 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 opencensus 7.0 7.1 7.2 7.3 7.4 8.0 parallel 7.1 7.2 7.3 7.4 -pcntl 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +pcntl 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 pcov 7.0 7.1 7.2 7.3 7.4 8.0 pdo_dblib 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -pdo_firebird 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -pdo_mysql 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -pdo_oci 7.0 7.1 7.2 7.3 7.4 8.0 -pdo_odbc 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -pdo_pgsql 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +pdo_firebird 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +pdo_mysql 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +pdo_oci 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +pdo_odbc 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +pdo_pgsql 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 pdo_sqlsrv 7.0 7.1 7.2 7.3 7.4 8.0 -pgsql 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +pgsql 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 propro 5.5 5.6 7.0 7.1 7.2 7.3 7.4 protobuf 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -pspell 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +pspell 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 pthreads 5.5 5.6 7.0 raphf 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 rdkafka 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 recode 5.5 5.6 7.0 7.1 7.2 7.3 redis 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 seaslog 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -shmop 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +shmop 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 smbclient 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -snmp 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +snmp 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 snuffleupagus 7.0 7.1 7.2 7.3 7.4 8.0 -soap 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -sockets 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +soap 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +sockets 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 solr 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 sqlsrv 7.0 7.1 7.2 7.3 7.4 8.0 ssh2 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 swoole 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 sybase_ct 5.5 5.6 -sysvmsg 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -sysvsem 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -sysvshm 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +sysvmsg 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +sysvsem 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +sysvshm 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 tensor 7.2 7.3 7.4 8.0 -tidy 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +tidy 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 timezonedb 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 uopz 5.5 5.6 7.0 7.1 7.2 7.3 7.4 uuid 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 vips 7.0 7.1 7.2 7.3 7.4 8.0 wddx 5.5 5.6 7.0 7.1 7.2 7.3 -xdebug 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +xdebug 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 xhprof 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 xlswriter 7.0 7.1 7.2 7.3 7.4 8.0 -xmlrpc 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -xsl 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +xmlrpc 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +xsl 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 yaml 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 yar 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 -zip 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 +zip 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 zookeeper 5.5 5.6 7.0 7.1 7.2 7.3 7.4 zstd 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 From 497296eeade49216b3a49f632d6202e9f9398483 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Wed, 30 Jun 2021 10:10:18 +0200 Subject: [PATCH 2/2] Don't run tests for PHP 8.1 on Alpine Linux 3.12 They don't update the PHP version on that image, it will remain at 8.1.0-alpha1 --- scripts/ci-test-extensions | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/scripts/ci-test-extensions b/scripts/ci-test-extensions index 331e0ff..df1154d 100755 --- a/scripts/ci-test-extensions +++ b/scripts/ci-test-extensions @@ -4,6 +4,22 @@ set -o errexit set -o nounset +# Check if we should use a specific PHP version for a specific distribution +# +# Arguments: +# $1: the distribution +# $2: the PHP version +shouldProcessPhpVersionForDistro() { + case "$2@$1" in + 8.1@alpine3.12) + return 1 + ;; + *) + return 0 + ;; + esac +} + # Extract the extensions to be tested from commit messages # # Update: EXTENSIONS_TO_BE_TESTED @@ -108,8 +124,11 @@ filterUnsupportedExensionsForDistro() { # $2: the PHP version # # Outputs: -# the full docker image ID +# the full docker image ID (if exists/is usable) getDockerImageName() { + if ! shouldProcessPhpVersionForDistro "$DOCKER_DISTRO" "$2"; then + return + fi case "$2" in 8.1) getDockerImageName_version="$2-rc" @@ -141,7 +160,6 @@ getDockerImageName() { getDockerImageName_log="$(docker pull "$getDockerImageName_imageName" 2>&1 || true)" if test -z "$(docker images -q "$getDockerImageName_imageName" 2>/dev/null)"; then if test "${getDockerImageName_log#*manifest unknown}" != "$getDockerImageName_log" || test "${getDockerImageName_log#*manifest for * not found}" != "$getDockerImageName_log"; then - true return fi printf '%s\n' "$getDockerImageName_log" >&2