diff --git a/data/supported-extensions b/data/supported-extensions index fdda786..e2a8a9b 100644 --- a/data/supported-extensions +++ b/data/supported-extensions @@ -9,7 +9,7 @@ calendar 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 cmark 7.0 7.1 7.2 7.3 7.4 csv 7.3 7.4 8.0 8.1 8.2 dba 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 -ddtrace 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +ddtrace 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 decimal 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 ds 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 enchant 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 diff --git a/install-php-extensions b/install-php-extensions index 78107bf..e65e813 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -130,6 +130,9 @@ normalizePHPModuleName() { ;; esac case "$normalizePHPModuleName_name" in + datadog_trace) + normalizePHPModuleName_name=ddtrace + ;; ioncube | ioncube\ loader) normalizePHPModuleName_name='ioncube_loader' ;; @@ -646,8 +649,7 @@ buildRequiredPackageLists() { buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile cmake" ;; ddtrace@alpine) - buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent curl" - buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile curl curl-dev" + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile curl-dev" ;; ddtrace@debian) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent curl" diff --git a/scripts/ci-filter-supported-extensions b/scripts/ci-filter-supported-extensions index c5807b4..87a161b 100755 --- a/scripts/ci-filter-supported-extensions +++ b/scripts/ci-filter-supported-extensions @@ -23,15 +23,21 @@ SUPPORTED_EXTENSIONS='' resetIFS for EXTENSION in $EXTENSIONS_LIST; do printf 'Checking extension "%s"... ' "$EXTENSION" >&2 + NORMALIZED_EXTENSION="$EXTENSION" case "$EXTENSION" in + datadog_trace) + NORMALIZED_EXTENSION=ddtrace + ;; pecl_http) - EXTENSION=http - printf '(using %s) ' "$EXTENSION" >&2 + NORMALIZED_EXTENSION=http ;; esac - if printf '%s' "$ALL_SUPPORTED_EXTENSIONS" | grep -q "^$EXTENSION\s"; then + if test "$NORMALIZED_EXTENSION" != "$EXTENSION"; then + printf '(using %s) ' "$NORMALIZED_EXTENSION" >&2 + fi + if printf '%s' "$ALL_SUPPORTED_EXTENSIONS" | grep -q "^$NORMALIZED_EXTENSION\s"; then printf 'supported.\n' >&2 - SUPPORTED_EXTENSIONS="$SUPPORTED_EXTENSIONS $EXTENSION" + SUPPORTED_EXTENSIONS="$SUPPORTED_EXTENSIONS $NORMALIZED_EXTENSION" else printf 'NOT supported.\n' >&2 fi