Handle tagged prereleases separately from releases and other prereleases

Author: cameel

.circleci/config.yml

@@ -1001,6 +1001,7 @@ jobs:
     <<: *base_ubuntu2404_xlarge
     steps:
       - build
+      - run: cat prerelease.txt
 
   # x64 ASAN build, for testing for memory related bugs
   b_ubu_asan: &b_ubu_asan

scripts/create_source_tarball.sh

@@ -8,14 +8,22 @@ source "${REPO_ROOT}/scripts/common.sh"
 cd "$REPO_ROOT"
 version=$(scripts/get_version.sh)
 commit_hash=$(git rev-parse --short=8 HEAD)
-commit_date=$(TZ=UTC git show --quiet --date="format-local:%Y.%-m.%-d" --format="%cd")
 
-# File exists and has zero size -> not a prerelease
-if [[ -e prerelease.txt && ! -s prerelease.txt ]]; then
-    version_string="$version"
-elif [[ -e prerelease.txt ]]; then
-    version_string="${version}-$(cat prerelease.txt)-${commit_hash}"
+if [[ -e prerelease.txt ]]; then
+    prerelease_suffix=$(cat prerelease.txt)
+    if [[ $prerelease_suffix == "" ]]; then
+        # File exists and has zero size -> not a prerelease
+        version_string="$version"
+    elif [[ $prerelease_suffix == pre.* ]]; then
+        # Tagged prerelease -> unambiguous, so commit hash not needed
+        version_string="${version}-${prerelease_suffix}"
+    else
+        # Nightly/develop/other prerelease -> include commit hash
+        version_string="${version}-${prerelease_suffix}-${commit_hash}"
+    fi
 else
+    # Nightly/develop/other prerelease -> include commit hash + default prerelease suffix
+    commit_date=$(TZ=UTC git show --quiet --date="format-local:%Y.%-m.%-d" --format="%cd")
     version_string="${version}-nightly-${commit_date}-${commit_hash}"
 fi
 

scripts/prerelease_suffix.sh

@@ -11,8 +11,10 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
     GNU_DATE=gdate
 fi
 
-if [[ $FORCE_RELEASE != "" || $git_tag == v* ]]; then
+if [[ $FORCE_RELEASE != "" || $git_tag =~ ^v[0-9.]+$ ]]; then
     echo -n
+elif [[ $git_tag =~ ^v[0-9.]+-pre. ]]; then
+    echo -n "pre.${git_tag#*-pre.}"
 else
     # Use last commit date rather than build date to avoid ending up with builds for
     # different platforms having different version strings (and therefore producing different bytecode)