Skip to content

Commit a768b2f

Browse files
committed
Testing version check
1 parent 597688f commit a768b2f

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ install:
308308
- touch custom_configure_options
309309
- ./bin/install-libzip
310310
- ./bin/install-libsodium
311+
- ./bin/install-password-argon2
311312
- . ./bin/install-onig # sourced to export ONIG_LIBS
312313
- MINOR_VERSION=`echo $VERSION | sed -E 's/^([0-9]+\.[0-9]+).*$/\1/'` # Rewrites 7.2, 7.2snapshot, 7.2.13 => '7.2'. Leaves 'master' as-is
313314
- |
@@ -317,7 +318,6 @@ install:
317318
cp default_configure_options.$RELEASE $HOME/.php-build/share/php-build/default_configure_options
318319
fi
319320
- cat custom_configure_options >> $HOME/.php-build/share/php-build/default_configure_options
320-
- ./bin/install-password-argon2
321321
- |
322322
if [[ $(lsb_release -cs) = "trusty" || $(lsb_release -cs) = "xenial" || $(lsb_release -cs) = "bionic" ]]; then
323323
if [[ $HOSTTYPE == "powerpc64le" ]]; then

bin/install-password-argon2

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ popd
2727

2828

2929
# add the option in custom_configure_options
30-
if [[ ! $VERSION == *"7.4"* ]] || [[ "$(printf "7.4\n$VERSION" | sort -V | head -n1)" < "7.4" ]]; then
30+
if [[ $VERSION =~ ^7.4 ]] || [[ "$(printf "7.4\n$VERSION" | sort -V | head -n1)" < "7.4" ]]; then
3131
echo "--with-password-argon2=$LIBARGON2_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
3232
else
3333
echo "--with-password-argon2" >> $TRAVIS_BUILD_DIR/custom_configure_options
3434
fi
35+

0 commit comments

Comments
 (0)