Fix get_stable_release_tag

Author: shivammathur

scripts/build_partials/version.sh

@@ -26,10 +26,11 @@ check_stable() {
 # Function to get the latest stable release tag for a PHP version.
 get_stable_release_tag() {
   source=$1
-  if [ "$source" = "web-php" ]; then
-    curl -sL https://www.php.net/releases/feed.php | grep -Po -m 1 "php-($PHP_VERSION.[0-9]+)" | head -n 1
+  if [ "$source" = "--web-php" ]; then
+    release_tag="$(curl -sL https://www.php.net/releases/feed.php | grep -Po -m 1 "php-(${php_version//./\\.}\.[0-9]+)" | head -n 1)"
+    [[ -z $release_tag ]] && echo "php-$(curl -sL https://www.php.net/releases | grep -Po -m 1 "${php_version//./\\.}\.[0-9]+" | head -n 1)" || echo "$release_tag"
   else
-    curl -H "Authorization: Bearer $GITHUB_TOKEN" -sL "https://api.github.com/repos/php/php-src/git/matching-refs/tags%2Fphp-$PHP_VERSION." | grep -Eo "php-[0-9]+\.[0-9]+\.[0-9]+\"" | tail -1 | cut -d '"' -f 1
+    curl -H "Authorization: Bearer $GITHUB_TOKEN" -sL "https://api.github.com/repos/php/php-src/git/matching-refs/tags%2Fphp-$php_version." | grep -Eo "php-[0-9]+\.[0-9]+\.[0-9]+\"" | tail -1 | cut -d '"' -f 1
   fi
 }
 

scripts/check-php-version.sh

@@ -3,8 +3,9 @@
 # Function to get the latest stable release tag for a PHP version.
 get_stable_release_tag() {
   source=$1
-  if [ "$source" = "web-php" ]; then
-    echo "php-$(curl -sL https://www.php.net/releases | grep -Po -m 1 "$php_version\.[0-9]+" | head -n 1)"
+  if [ "$source" = "--web-php" ]; then
+    release_tag="$(curl -sL https://www.php.net/releases/feed.php | grep -Po -m 1 "php-(${php_version//./\\.}\.[0-9]+)" | head -n 1)"
+    [[ -z $release_tag ]] && echo "php-$(curl -sL https://www.php.net/releases | grep -Po -m 1 "${php_version//./\\.}\.[0-9]+" | head -n 1)" || echo "$release_tag"
   else
     curl -H "Authorization: Bearer $GITHUB_TOKEN" -sL "https://api.github.com/repos/php/php-src/git/matching-refs/tags%2Fphp-$php_version." | grep -Eo "php-[0-9]+\.[0-9]+\.[0-9]+\"" | tail -1 | cut -d '"' -f 1
   fi
@@ -21,8 +22,7 @@ else
   for php_version in "${php_versions_to_check[@]}"; do
     # Fetch new and existing version, compare and add to php_versions_to_build array.
     # Here we only check for stable as both RC and nightly should be built.
-    existing_version=$(curl -sL https://github.com/shivammathur/php-builder/releases/download/"$php_version"/php"$php_version".log
-)
+    existing_version=$(curl -sL https://github.com/shivammathur/php-builder/releases/download/"$php_version"/php"$php_version".log)
     new_version="$(get_stable_release_tag "$3")"
     if [ "$new_version" != "$existing_version" ]; then
       php_versions_to_build+=("$php_version")

scripts/release.sh

@@ -10,10 +10,11 @@ log_build() {
 # Function to get the latest stable release tag for a PHP version.
 get_stable_release_tag() {
   source=$1
-  if [ "$source" = "web-php" ]; then
-    curl -sL https://www.php.net/releases/feed.php | grep -Po -m 1 "php-($PHP_VERSION.[0-9]+)" | head -n 1
+  if [ "$source" = "--web-php" ]; then
+    release_tag="$(curl -sL https://www.php.net/releases/feed.php | grep -Po -m 1 "php-(${php_version//./\\.}\.[0-9]+)" | head -n 1)"
+    [[ -z $release_tag ]] && echo "php-$(curl -sL https://www.php.net/releases | grep -Po -m 1 "${php_version//./\\.}\.[0-9]+" | head -n 1)" || echo "$release_tag"
   else
-    curl -H "Authorization: Bearer $GITHUB_TOKEN" -sL "https://api.github.com/repos/php/php-src/git/matching-refs/tags%2Fphp-$PHP_VERSION." | grep -Eo "php-[0-9]+\.[0-9]+\.[0-9]+\"" | tail -1 | cut -d '"' -f 1
+    curl -H "Authorization: Bearer $GITHUB_TOKEN" -sL "https://api.github.com/repos/php/php-src/git/matching-refs/tags%2Fphp-$php_version." | grep -Eo "php-[0-9]+\.[0-9]+\.[0-9]+\"" | tail -1 | cut -d '"' -f 1
   fi
 }