Skip to content

Commit 97834fb

Browse files
author
Sam Minnee
committed
Fix version-specific configuration for compiling PHP
I have reverted dc3c12b as this was a misunderstanding of intended behaviour. The special config files for PHP versions use ‘master’, ‘7.2’, and ‘7.4’ as suffix. The new MINOR_VERSION variable will convert all the following to 7.4 before looking for the file: 7.4 7.4.23 7.4snapshot It appears as though the “7.2” file wasn’t being used without this change, as the previous substitution command was converting “7.2snapshot” ot “7”.
1 parent 561ef55 commit 97834fb

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,10 @@ install:
8585
- ./bin/install-libsodium
8686
- ./bin/install-password-argon2
8787
- . ./bin/install-onig # sourced to export ONIG_LIBS
88+
- 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
8889
- |
89-
if [[ -f default_configure_options.$RELEASE-${VERSION%*.*} ]]; then
90-
cp default_configure_options.$RELEASE-${VERSION%*.*} $HOME/.php-build/share/php-build/default_configure_options
90+
if [[ -f default_configure_options.$RELEASE-$MINOR_VERSION ]]; then
91+
cp default_configure_options.$RELEASE-$MINOR_VERSION $HOME/.php-build/share/php-build/default_configure_options
9192
else
9293
cp default_configure_options.$RELEASE $HOME/.php-build/share/php-build/default_configure_options
9394
fi

0 commit comments

Comments
 (0)