Account for prereleases in the logic that distinguishes between releases and nightlies

Author: cameel

.circleci/config.yml

@@ -186,15 +186,7 @@ commands:
     steps:
       - run:
           name: Store prerelease suffix
-          command: |
-            if [[ -n "$CIRCLE_TAG" || -n "$FORCE_RELEASE" ]]; then
-                echo -n > prerelease.txt
-            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)
-                # if the CI is triggered just before midnight.
-                TZ=UTC git show --quiet --date="format-local:%Y.%-m.%-d" --format="nightly.%cd" > prerelease.txt
-            fi
+          command: "scripts/prerelease_suffix.sh" nightly "$CIRCLE_TAG" > prerelease.txt
 
   install_and_check_minimum_requirements:
     parameters:

scripts/build.sh

@@ -10,7 +10,7 @@ else
     BUILD_TYPE="$1"
 fi
 
-if [[ $(git tag --points-at HEAD 2> /dev/null) == v* ]]; then
+if [[ $(git tag --points-at HEAD 2> /dev/null) =~ ^v[0-9.]+$ ]]; then
     echo -n > prerelease.txt
 fi
 

scripts/ci/build.sh

@@ -9,14 +9,7 @@ prerelease_source="${1:-ci}"
 
 cd "${ROOTDIR}"
 
-if [[ -n $CIRCLE_TAG || -n $FORCE_RELEASE ]]; then
-    echo -n > prerelease.txt
-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)
-    # if the CI is triggered just before midnight.
-    TZ=UTC git show --quiet --date="format-local:%Y.%-m.%-d" --format="${prerelease_source}.%cd" > prerelease.txt
-fi
+"${ROOTDIR}/scripts/prerelease_suffix.sh" "$prerelease_source" "$CIRCLE_TAG" > prerelease.txt
 
 mkdir -p build
 cd build

scripts/ci/build_emscripten.sh

@@ -45,14 +45,7 @@ function build() {
 
     cd "${ROOT_DIR}"
 
-    if [[ -n $CIRCLE_TAG || -n $FORCE_RELEASE || $(git tag --points-at HEAD 2> /dev/null) == v* ]]; then
-        echo -n > prerelease.txt
-    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)
-        # if the CI is triggered just before midnight.
-        TZ=UTC git show --quiet --date="format-local:%Y.%-m.%-d" --format="${prerelease_source}.%cd" > prerelease.txt
-    fi
+    "${SCRIPT_DIR}/prerelease_suffix.sh" "$prerelease_source" "$(git tag --points-at HEAD 2> /dev/null)"
 
     # Disable warnings for unqualified `move()` calls, introduced and enabled by
     # default in clang-16 which is what the emscripten docker image uses.

scripts/prerelease_suffix.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+(( $# <= 2 )) || { >&2 echo "Usage: $0 [PRERELEASE_SOURCE] [GIT_TAG]"; exit 1; }
+prerelease_source="${1:-nightly}"
+git_tag="${2:-}"
+FORCE_RELEASE="${FORCE_RELEASE:-}"
+
+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)
+    # if the CI is triggered just before midnight.
+    TZ=UTC git show --quiet --date="format-local:%Y.%-m.%-d" --format="${prerelease_source}.%cd"
+fi