From 93322b87d0e65e8d59b186da34b81ffc5a1dea90 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Thu, 14 Jan 2021 17:05:23 +0100 Subject: [PATCH] Add script version --- .github/workflows/readme-release.yml | 3 +++ install-php-extensions | 29 ++++++++++++++++++++++++++++ scripts/ci-test-extensions | 2 +- scripts/test-installcomposer | 2 +- scripts/test-installversion | 2 +- scripts/test-restore-apt | 2 +- 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/.github/workflows/readme-release.yml b/.github/workflows/readme-release.yml index b930e3b..b47b6d0 100644 --- a/.github/workflows/readme-release.yml +++ b/.github/workflows/readme-release.yml @@ -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<> "$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 diff --git a/install-php-extensions b/install-php-extensions index 048f56d..3103cfb 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -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 <"$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" diff --git a/scripts/test-installcomposer b/scripts/test-installcomposer index 6e90821..0ba2757 100755 --- a/scripts/test-installcomposer +++ b/scripts/test-installcomposer @@ -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 diff --git a/scripts/test-installversion b/scripts/test-installversion index b1dcd42..84cbcf3 100755 --- a/scripts/test-installversion +++ b/scripts/test-installversion @@ -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 diff --git a/scripts/test-restore-apt b/scripts/test-restore-apt index dd9f408..4165297 100755 --- a/scripts/test-restore-apt +++ b/scripts/test-restore-apt @@ -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