Merge pull request #281 from mlocati/non-exact-version

Support installing generic versions of extensions
pull/284/head 1.2.0
Michele Locati 2021-01-26 17:04:28 +01:00 committed by GitHub
commit fceb572fe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 73 additions and 4 deletions

View File

@ -110,6 +110,8 @@ jobs:
- '' - ''
- 2.9.8 - 2.9.8
- 3.0.0 - 3.0.0
- ^2
- ^2.8
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v1 uses: actions/checkout@v1

View File

@ -50,7 +50,7 @@ docker pull mlocati/php-extension-installer
*otherwise the `COPY` instruction could use a previously downloaded, outdated version of the image stored in the local docker cache.* *otherwise the `COPY` instruction could use a previously downloaded, outdated version of the image stored in the local docker cache.*
### Installing a specific version of an extension ### Installing specific versions of an extension
Simply append `-<version>` to the module name. Simply append `-<version>` to the module name.
For example: For example:
@ -59,6 +59,17 @@ For example:
install-php-extensions xdebug-2.9.7 install-php-extensions xdebug-2.9.7
``` ```
The script also support resolving *compatible* versions by prefixing the version with a caret (`^`).
For example:
```sh
# Install the most recent xdebug 2.x version (for example 2.9.8)
install-php-extensions xdebug-^2
# Install the most recent xdebug 2.x version (for example 2.8.1)
install-php-extensions xdebug-^2.8
```
### Installing composer ### Installing composer
You can also install [composer](https://getcomposer.org/), and you also can specify a major version of it, or a full version. You can also install [composer](https://getcomposer.org/), and you also can specify a major version of it, or a full version.

View File

@ -141,8 +141,10 @@ getPeclModuleName() {
} }
# Parse a module name (and optionally version) as received via command arguments, extracting the version and normalizing it # Parse a module name (and optionally version) as received via command arguments, extracting the version and normalizing it
# Example: # Examples:
# xdebug-2.9.8 # xdebug-2.9.8
# xdebug-^2
# xdebug-^2.9
# #
# Arguments: # Arguments:
# $1: the name of the module to be normalized # $1: the name of the module to be normalized
@ -189,6 +191,56 @@ getWantedPHPModuleVersion() {
fi fi
} }
# Get the wanted PHP module version, resolving it if it starts with '^'
#
# Arguments:
# $1: the name of the module to be normalized
#
# Output:
# The version to be used
resolveWantedPHPModuleVersion() {
resolveWantedPHPModuleVersion_raw="$(getWantedPHPModuleVersion "$1")"
resolveWantedPHPModuleVersion_afterCaret="${resolveWantedPHPModuleVersion_raw#^}"
if test "$resolveWantedPHPModuleVersion_raw" = "$resolveWantedPHPModuleVersion_afterCaret"; then
printf '%s' "$resolveWantedPHPModuleVersion_raw"
return
fi
resolveWantedPHPModuleVersion_xml="$(curl -sSLf "http://pecl.php.net/rest/r/$1/allreleases.xml")"
resolveWantedPHPModuleVersion_versions="$(printf '%s' "$resolveWantedPHPModuleVersion_xml" | tr -s ' \t\r\n' ' ' | sed -r 's# *<#\n<#g' | grep '<v>' | sed 's#<v>##g' | sed 's# ##g')"
resetIFS
for resolveWantedPHPModuleVersion_version in $resolveWantedPHPModuleVersion_versions; do
resolveWantedPHPModuleVersion_suffix="${resolveWantedPHPModuleVersion_version#$resolveWantedPHPModuleVersion_afterCaret}"
if test "$resolveWantedPHPModuleVersion_version" != "${resolveWantedPHPModuleVersion_version#$resolveWantedPHPModuleVersion_afterCaret.}"; then
# Example: looking for 1.0, found 1.0.1
printf '%s' "$resolveWantedPHPModuleVersion_version"
return
fi
done
for resolveWantedPHPModuleVersion_version in $resolveWantedPHPModuleVersion_versions; do
resolveWantedPHPModuleVersion_suffix="${resolveWantedPHPModuleVersion_version#$resolveWantedPHPModuleVersion_afterCaret}"
if test "$resolveWantedPHPModuleVersion_version" = "$resolveWantedPHPModuleVersion_suffix"; then
continue
fi
if test -z "$resolveWantedPHPModuleVersion_suffix"; then
# Example: looking for 1.0, found exactly it
printf '%s' "$resolveWantedPHPModuleVersion_version"
return
fi
case "$resolveWantedPHPModuleVersion_suffix" in
[0-9])
# Example: looking for 1.1, but this is 1.10
;;
*)
# Example: looking for 1.1, this is 1.1rc1
printf '%s' "$resolveWantedPHPModuleVersion_version"
return
;;
esac
done
printf 'Unable to find a version of "%s" compatible with "%s"\nAvailable versions are:\n%s\n' "$1" "$resolveWantedPHPModuleVersion_raw" "$resolveWantedPHPModuleVersion_versions" >&2
exit 1
}
# Set these variables: # Set these variables:
# - PHP_PREINSTALLED_MODULES the normalized list of PHP modules installed before running this script # - PHP_PREINSTALLED_MODULES the normalized list of PHP modules installed before running this script
setPHPPreinstalledModules() { setPHPPreinstalledModules() {
@ -1222,6 +1274,7 @@ installMicrosoftSqlServerODBC() {
# Install Composer # Install Composer
installComposer() { installComposer() {
installComposer_version="$(getWantedPHPModuleVersion @composer)" installComposer_version="$(getWantedPHPModuleVersion @composer)"
installComposer_version="${installComposer_version#^}"
if test -z "$installComposer_version"; then if test -z "$installComposer_version"; then
installComposer_fullname=composer installComposer_fullname=composer
installComposer_flags='' installComposer_flags=''
@ -1442,7 +1495,7 @@ getPackageSource() {
installRemoteModule() { installRemoteModule() {
installRemoteModule_module="$1" installRemoteModule_module="$1"
printf '### INSTALLING REMOTE MODULE %s ###\n' "$installRemoteModule_module" printf '### INSTALLING REMOTE MODULE %s ###\n' "$installRemoteModule_module"
installRemoteModule_version="$(getWantedPHPModuleVersion "$installRemoteModule_module")" installRemoteModule_version="$(resolveWantedPHPModuleVersion "$installRemoteModule_module")"
rm -rf "$CONFIGURE_FILE" rm -rf "$CONFIGURE_FILE"
installRemoteModule_manuallyInstalled=0 installRemoteModule_manuallyInstalled=0
installRemoteModule_cppflags='' installRemoteModule_cppflags=''

View File

@ -5,6 +5,7 @@ set -o errexit
set -o nounset set -o nounset
WANTED_VERSION="${1:-}" WANTED_VERSION="${1:-}"
WANTED_VERSION_AFTERCARET="${1#^}"
INSTALLME=xdebug INSTALLME=xdebug
if test -n "$WANTED_VERSION"; then if test -n "$WANTED_VERSION"; then
INSTALLME="$INSTALLME-$1" INSTALLME="$INSTALLME-$1"
@ -14,9 +15,11 @@ CI=true ./install-php-extensions "$INSTALLME"
INSTALLED_VERSION="$(php --ri xdebug | grep -Ei 'Version\s*=>\s*' | sed -E 's/^.*?=>\s*//')" INSTALLED_VERSION="$(php --ri xdebug | grep -Ei 'Version\s*=>\s*' | sed -E 's/^.*?=>\s*//')"
if test -z "$WANTED_VERSION"; then if test -z "$WANTED_VERSION"; then
echo 'Installing the default version worked' printf 'Installing the default version worked (we installed version %s)\n' "$INSTALLED_VERSION"
elif test "$WANTED_VERSION" = "$INSTALLED_VERSION"; then elif test "$WANTED_VERSION" = "$INSTALLED_VERSION"; then
printf 'Installing specific version %s worked\n' "$WANTED_VERSION" printf 'Installing specific version %s worked\n' "$WANTED_VERSION"
elif test "$WANTED_VERSION" != "$WANTED_VERSION_AFTERCARET" && test "${INSTALLED_VERSION#$WANTED_VERSION_AFTERCARET.}" != "$INSTALLED_VERSION"; then
printf 'Installing version compatible with %s worked (we installed version %s)\n' "$WANTED_VERSION" "$INSTALLED_VERSION"
else else
printf 'We wanted to install version %s, but we installed %s\n' "$WANTED_VERSION" "$INSTALLED_VERSION" >&2 printf 'We wanted to install version %s, but we installed %s\n' "$WANTED_VERSION" "$INSTALLED_VERSION" >&2
exit 1 exit 1