Merge pull request #119 from mlocati/oauth

Add support for oauth extension
pull/120/head
Michele Locati 2020-02-16 18:53:37 +01:00 committed by GitHub
commit f14b045b56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 1 deletions

View File

@ -30,6 +30,7 @@ msgpack 5.5 5.6 7.0 7.1 7.2 7.3 7.4
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
oauth 5.5 5.6 7.0 7.1 7.2 7.3 7.4
odbc 5.5 5.6 7.0 7.1 7.2 7.3 7.4
opcache 5.5 5.6 7.0 7.1 7.2 7.3 7.4
opencensus 7.0 7.1 7.2 7.3 7.4

View File

@ -428,6 +428,16 @@ buildRequiredPackageLists() {
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libsybdb5"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile freetds-dev"
;;
oauth@alpine)
if test $buildRequiredPackageLists_phpv -ge 700; then
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile pcre-dev"
fi
;;
oauth@debian)
if test $buildRequiredPackageLists_phpv -ge 700; then
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpcre3-dev"
fi
;;
odbc@alpine)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent unixodbc"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile unixodbc-dev"
@ -1107,6 +1117,11 @@ installPECLModule() {
installPECLModule_actual="$2-0.5.7"
fi
;;
oauth)
if test $1 -le 506; then
installPECLModule_actual="$2-1.2.3"
fi
;;
opencensus)
if test $1 -le 702; then
installPECLModule_actual="$2-alpha"

View File

@ -66,6 +66,7 @@ extractExtensionsFromData() {
fi
elif test -z "${extractExtensionsFromData_line##+*}"; then
extractExtensionsFromData_extension="${extractExtensionsFromData_line%% *}"
extractExtensionsFromData_extension="${extractExtensionsFromData_extension#+}"
if ! stringInList "$extractExtensionsFromData_extension" "$EXTENSIONS_TO_BE_TESTED"; then
EXTENSIONS_TO_BE_TESTED="$EXTENSIONS_TO_BE_TESTED $extractExtensionsFromData_extension"
fi
@ -236,9 +237,12 @@ testExtensionFor() {
fi
printf ' - Docker image: %s\n' "$testExtensionFor_Image"
testExtensionFor_out="$(mktemp)"
testExtensionFor_start=$(date +%s)
if $(docker run --rm --volume "$CI_BUILD_DIR:/app" --workdir /app "$testExtensionFor_Image" sh -c "./install-php-extensions $1 && php ./scripts/check-installed-extension.php $1" >"$testExtensionFor_out" 2>&1); then
testExtensionFor_end=$(date +%s)
testExtensionFor_delta=$(expr $testExtensionFor_end - $testExtensionFor_start)
rm -rf "$testExtensionFor_out"
printf ' - Passed\n'
printf ' - Passed in %s seconds\n' $testExtensionFor_delta
return 0
fi
printf ' - FAILED!\n' >&2