diff options
| author | Michal Čihař <michal@cihar.com> | 2018-04-18 16:43:12 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2018-04-18 16:43:12 +0300 |
| commit | 66e4c3de687b95505d797a8436ca8b98c9e133e4 (patch) | |
| tree | 1c53a3ca1b2d239119a811eee634dec4f39eec46 /scripts | |
| parent | 3c85d747b4180fa69a079d6f36178ee22f9ed095 (diff) | |
Make create-release script compatible with QA_4_8
The version in master is supposed to handle all supported branches.
See https://github.com/phpmyadmin/docker/issues/157
Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/create-release.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 4d87dd4044..8bcfc74d99 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -222,7 +222,8 @@ rm -f .travis.yml .coveralls.yml .scrutinizer.yml .jshintrc .weblate codecov.yml rm -f README.rst if [ ! -d libraries/tcpdf ] ; then - PHP_REQ=`sed -n '/"php"/ s/.*"\^\([0-9]\.[0-9]\).*/\1/p' composer.json` + PHP_REQ=`sed -n '/"php"/ s/.*"(\^|>=)\([0-9]\.[0-9]\).*/\2/p' composer.json` + if [ -z "$PHP_REQ" ] ; then echo "Failed to figure out required PHP version from composer.json" exit 2 |