Missed valgrind docker image versioning.

tricky · tricky · commit aa44f33e3a52 · 2025-10-05T19:42:21.000+03:00
diff --git a/ci/test_dockerized.sh b/ci/test_dockerized.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-if [[ $# < 1 || $# > 2 ]]; then
-    echo "Usage: $0 PHP_VERSION [i386]" 1>&2
-    echo "e.g. $0 8.0 php" 1>&2
+if [[ $# < 1 || $# > 3 ]]; then
+    echo "Usage: $0 PHP_VERSION PHP_VERSION_FULL [i386]" 1>&2
+    echo "e.g. $0 8.0 8.0.10 i386" 1>&2
     echo "The PHP_VERSION is the version of the php docker image to use" 1>&2
     exit 1
 fi
@@ -10,21 +10,21 @@ fi
 # -u fail for undefined variables
 set -xeu
 PHP_VERSION=$1
-PHP_FULL_VERSION=${2:-$PHP_VERSION}
+PHP_VERSION_FULL=${2:-$PHP_VERSION}
 ARCHITECTURE=${3:-}
 
 # Determine if we have a pre-release version, and if so, use the full version
 # instead of the short version. Docker hub only has short tags for stable
 # releases.
-case "$PHP_FULL_VERSION" in
+case "$PHP_VERSION_FULL" in
     *RC[0-9]*)
-        PHP_VERSION="${PHP_FULL_VERSION}"
+        PHP_VERSION="${PHP_VERSION_FULL}"
         ;;
     *alpha[0-9]*)
-        PHP_VERSION="${PHP_FULL_VERSION}"
+        PHP_VERSION="${PHP_VERSION_FULL}"
         ;;
     *beta[0-9]*)
-        PHP_VERSION="${PHP_FULL_VERSION}"
+        PHP_VERSION="${PHP_VERSION_FULL}"
         ;;
     *)
         # Use only the major.minor version for stable releases.
diff --git a/ci/test_dockerized_valgrind.sh b/ci/test_dockerized_valgrind.sh
@@ -23,6 +23,22 @@ PHP_VERSION=$1
 PHP_VERSION_FULL=$2
 ARCHITECTURE=${3:-}
 
+case "$PHP_VERSION_FULL" in
+    *RC[0-9]*)
+        PHP_VERSION="${PHP_VERSION_FULL}"
+        ;;
+    *alpha[0-9]*)
+        PHP_VERSION="${PHP_VERSION_FULL}"
+        ;;
+    *beta[0-9]*)
+        PHP_VERSION="${PHP_VERSION_FULL}"
+        ;;
+    *)
+        # Use only the major.minor version for stable releases.
+        # As provided in PHP_VERSION
+        ;;
+esac
+
 # NOTE: php 7.3-8.0 (but not 8.1) will fail in valgrind without "--with-valgrind" because php-src uses custom assembly for its implementation of zend_string_equals
 # In order to fix those false positives, a different set of images would be needed where (1) valgrind was installed before compiling php, and (2) php was compiled with support for valgrind (--with-valgrind) to avoid false positives
 # docker run --rm $DOCKER_IMAGE ci/test_inner_valgrind.sh
