commit
841e537432
|
@ -148,6 +148,9 @@ jobs:
|
|||
printf 'Release notes:\n%s\n' "$RELEASE_NOTES"
|
||||
printf 'RELEASE_NAME=v%s\n' "$VERSIONTAG_THIS" >> "$GITHUB_ENV"
|
||||
printf 'RELEASE_NOTES<<EOF\n%s\nEOF\n' "$RELEASE_NOTES" >> "$GITHUB_ENV"
|
||||
- name: Set script version
|
||||
if: env.VERSIONTAG_THIS != ''
|
||||
run: sed -i -E "s/^(IPE_VERSION=)master$/\1$VERSIONTAG_THIS/" install-php-extensions
|
||||
- name: Login to Docker Hub
|
||||
if: env.VERSIONTAG_THIS != ''
|
||||
uses: docker/login-action@v1
|
||||
|
|
|
@ -17,6 +17,35 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable
|
|||
exit 1
|
||||
fi
|
||||
|
||||
IPE_VERSION=master
|
||||
|
||||
if test "$IPE_VERSION" = master && test "${CI:-}" != true; then
|
||||
cat <<EOF
|
||||
|
||||
#############################################################################################################
|
||||
# #
|
||||
# W A R N I N G ! ! ! #
|
||||
# #
|
||||
# You are using an unsupported method to get install-php-extensions! #
|
||||
# #
|
||||
# Please update the way you fetch it. Read the instrictions at #
|
||||
# https://github.com/mlocati/docker-php-extension-installer#usage #
|
||||
# #
|
||||
# For example, if you get this script by fetching #
|
||||
# https://raw.githubusercontent.com/mlocati/docker-php-extension-installer/master/install-php-extensions #
|
||||
# replace it with #
|
||||
# https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions #
|
||||
# #
|
||||
# Sleeping for a while so you get bored of this and act ;) #
|
||||
# #
|
||||
#############################################################################################################
|
||||
|
||||
EOF
|
||||
sleep 10 || true
|
||||
else
|
||||
printf 'install-php-extensions v.%s\n' "$IPE_VERSION"
|
||||
fi
|
||||
|
||||
# Reset the Internal Field Separator
|
||||
resetIFS() {
|
||||
IFS='
|
||||
|
|
|
@ -285,7 +285,7 @@ testExtensionFor() {
|
|||
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
|
||||
if $(docker run --rm --volume "$CI_BUILD_DIR:/app" --env CI=true --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"
|
||||
|
|
|
@ -10,7 +10,7 @@ if test -n "$WANTED_VERSION"; then
|
|||
INSTALLME="$INSTALLME-$1"
|
||||
fi
|
||||
|
||||
./install-php-extensions "$INSTALLME"
|
||||
CI=true ./install-php-extensions "$INSTALLME"
|
||||
|
||||
INSTALLED_VERSION="$(composer --version | sed -E 's/^.*[Vv]ersion\s*(\S+).*$/\1/')"
|
||||
if test -z "$WANTED_VERSION"; then
|
||||
|
|
|
@ -10,7 +10,7 @@ if test -n "$WANTED_VERSION"; then
|
|||
INSTALLME="$INSTALLME-$1"
|
||||
fi
|
||||
|
||||
./install-php-extensions "$INSTALLME"
|
||||
CI=true ./install-php-extensions "$INSTALLME"
|
||||
|
||||
INSTALLED_VERSION="$(php --ri xdebug | grep -Ei 'Version\s*=>\s*' | sed -E 's/^.*?=>\s*//')"
|
||||
if test -z "$WANTED_VERSION"; then
|
||||
|
|
|
@ -8,7 +8,7 @@ apt-get update -qq
|
|||
apt-get upgrade -qqy
|
||||
apt-get install -qqy libssl-dev
|
||||
|
||||
./install-php-extensions zip
|
||||
CI=true ./install-php-extensions zip
|
||||
|
||||
if test -z "$(dpkg --get-selections | grep -E '^libssl-dev[:\s].*install$')"; then
|
||||
echo 'The libssl-dev APT package has not been restored.' >&2
|
||||
|
|
Loading…
Reference in New Issue