public-mirrors
/
docker-php-extension-installer
mirror of https://github.com/mlocati/docker-php-extension-installer
1
0
Fork 0
Code

Merge pull request #425 from mlocati/easier-special-reqs 

Simplify exclusion of whole distros
pull/426/head
Michele Locati 2021-08-26 10:02:53 +02:00 committed by GitHub
parent 211681628b d305065edd
commit 21bb7a58e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/special-requirements
View File

@ -1,5 +1,5 @@
parallel zts parallel zts
pdo_sqlsrv !7.0-alpine3.7 !7.1-alpine3.7 !7.2-alpine3.7 !7.1-alpine3.8 !7.2-alpine3.8 !7.3-alpine3.8 !7.3-bullseye !7.4-bullseye !8.0-bullseye !8.1-bullseye pdo_sqlsrv !alpine3.7 !alpine3.8 !bullseye
pthreads zts pthreads zts
sqlsrv !7.0-alpine3.7 !7.1-alpine3.7 !7.2-alpine3.7 !7.1-alpine3.8 !7.2-alpine3.8 !7.3-alpine3.8 !7.1-alpine3.9 !7.1-alpine3.10 !7.3-bullseye !7.4-bullseye !8.0-bullseye !8.1-bullseye sqlsrv !alpine3.7 !alpine3.8 !7.1-alpine3.9 !7.1-alpine3.10 !bullseye
vips !7.0-alpine3.7 !7.1-alpine3.7 !7.2-alpine3.7 !7.1-alpine3.8 !7.2-alpine3.8 !7.3-alpine3.8 !7.1-alpine3.9 !7.2-alpine3.9 !7.3-alpine3.9 !7.0-jessie !7.1-jessie !7.2-jessie vips !alpine3.7 !alpine3.8 !alpine3.9 !jessie

6
scripts/ci-test-extensions
View File

@ -248,11 +248,11 @@ getAllPHPVersionsForExtension() {
done done
done <"$CI_BUILD_DIR/data/supported-extensions" done <"$CI_BUILD_DIR/data/supported-extensions"
filterUnsupportedExensionsForDistro_reqs="$CI_BUILD_DIR/data/special-requirements" getAllPHPVersionsForExtension_reqs="$CI_BUILD_DIR/data/special-requirements"
if test -f "$filterUnsupportedExensionsForDistro_reqs"; then if test -f "$getAllPHPVersionsForExtension_reqs"; then
getAllPHPVersionsForExtension_filtered_result='' getAllPHPVersionsForExtension_filtered_result=''
for getAllPHPVersionsForExtension_result_filter in $getAllPHPVersionsForExtension_result; do for getAllPHPVersionsForExtension_result_filter in $getAllPHPVersionsForExtension_result; do
if stringInList "!$getAllPHPVersionsForExtension_result_filter-$IPETEST_DOCKER_DISTRO" "$(cat "$filterUnsupportedExensionsForDistro_reqs" | grep -E "^$1[ \t]")"; then if stringInList "!$getAllPHPVersionsForExtension_result_filter-$IPETEST_DOCKER_DISTRO" "$(cat "$getAllPHPVersionsForExtension_reqs" | grep -E "^$1[ \t]")"; then
printf 'Note: extension "%s" is not supported for distro "%s" using php "%s"\n' "$1" "$IPETEST_DOCKER_DISTRO" "$getAllPHPVersionsForExtension_result_filter" >/dev/stderr printf 'Note: extension "%s" is not supported for distro "%s" using php "%s"\n' "$1" "$IPETEST_DOCKER_DISTRO" "$getAllPHPVersionsForExtension_result_filter" >/dev/stderr
else else
getAllPHPVersionsForExtension_filtered_result="$getAllPHPVersionsForExtension_filtered_result $getAllPHPVersionsForExtension_result_filter" getAllPHPVersionsForExtension_filtered_result="$getAllPHPVersionsForExtension_filtered_result $getAllPHPVersionsForExtension_result_filter"

3
scripts/tests/sqlsrv
View File

@ -29,11 +29,14 @@ sqlsrv_connect(
'PWD' => 'password', 'PWD' => 'password',
] ]
); );
$rc = 0;
$errors = sqlsrv_errors(SQLSRV_ERR_ALL); $errors = sqlsrv_errors(SQLSRV_ERR_ALL);
if (is_array($errors)) { if (is_array($errors)) {
foreach ($errors as $error) { foreach ($errors as $error) {
if (isset($error['message']) && stripos($error['message'], 'This extension requires the Microsoft ODBC Driver for SQL Server') !== false) { if (isset($error['message']) && stripos($error['message'], 'This extension requires the Microsoft ODBC Driver for SQL Server') !== false) {
fwrite(STDERR, trim($error['message']) . "\n"); fwrite(STDERR, trim($error['message']) . "\n");
$rc = 1;
} }
} }
} }
exit($rc);