update.sh: use version id for version comparison #1040
Conversation
|
This doesn't make a difference for the current set of supported versions, but I hope it prevents problems once we have multiple versions for both 7.x and 8.x. It made my work a bit simpler when supporting 5.x too. |
|
Thanks for the contribution! This definitely seems like a good idea. 👍 I'd rather have a version ID function so that the My rough idea would be something like |
|
@yosifkit Sounds good. I added a function |
update.sh
Outdated
| as_version_id() { | ||
| local fullVersion="$1" | ||
| # strip prelease suffix | ||
| fullVersion="${fullVersion/[a-z]*/}" |
There was a problem hiding this comment.
MIght be safer to use "${fullVersion%[a-z]*}" so that it only matches the end?
update.sh
Outdated
| # sodium is part of php core 7.2+ https://wiki.php.net/rfc/libsodium | ||
| sed -ri '/sodium/d' "$version/$suite/$variant/Dockerfile" | ||
| fi | ||
| if [ "$variant" = 'fpm' -a "$majorVersion" = '7' -a "$minorVersion" -lt '3' ]; then | ||
| if [ "$variant" = 'fpm' -a "$versionId" -lt '70300' ]; then |
Use version id (single integer) for version comparisons. This is clearer and less error prone than combining conditions on major and minor. The convention used is the same as PHP_VERSION_ID, which is standard since PHP 5.2.7 and commonly used for simple version comparisons. See: https://www.php.net/manual/en/function.phpversion.php Co-authored-by: Tianon Gravi <admwiggin@gmail.com>
Use version id (single integer) for version comparisons. This is clearer
and less error prone than combining conditions on major and minor.
The convention used is the same as PHP_VERSION_ID, which is standard
since PHP 5.2.7 and commonly used for simple version comparisons.
See: https://www.php.net/manual/en/function.phpversion.php