Unify the prerelease suffix logic across all scripts and CI

Author: cameel

.circleci/config.yml

@@ -187,11 +187,7 @@ commands:
       - run:
           name: Store prerelease suffix
           command: |
-            if [[ -n $CIRCLE_TAG ]]; then
-              echo -n > prerelease.txt;
-            else
-              date -u +"nightly.%Y.%-m.%-d" > prerelease.txt;
-            fi
+            "scripts/prerelease_suffix.sh" nightly "$CIRCLE_TAG" > prerelease.txt
 
   install_and_check_minimum_requirements:
     parameters:

scripts/build.sh

@@ -10,8 +10,10 @@ else
     BUILD_TYPE="$1"
 fi
 
-if [[ $(git tag --points-at HEAD 2> /dev/null) == v* ]]; then
-    touch "${ROOTDIR}/prerelease.txt"
+# Intentionally not using prerelease_suffix.sh here. We do not want lingering prerelease.txt in
+# dev builds, accidentally overriding version when someone runs the build manually.
+if [[ $(git tag --points-at HEAD 2> /dev/null) =~ ^v[0-9.]+$ ]]; then
+    echo -n > prerelease.txt
 fi
 
 mkdir -p "$BUILDDIR"

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)" > prerelease.txt
 
     # Disable warnings for unqualified `move()` calls, introduced and enabled by
     # default in clang-16 which is what the emscripten docker image uses.

scripts/ci/build_win.sh

@@ -8,20 +8,7 @@ FORCE_RELEASE="${FORCE_RELEASE:-}"
 CIRCLE_TAG="${CIRCLE_TAG:-}"
 
 cd "$ROOTDIR"
-if [[ $FORCE_RELEASE != "" || $CIRCLE_TAG != "" ]]; 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.
-    # NOTE: The -local suffix makes git not use the timezone from the commit but instead convert to
-    # local one, which we explicitly set to UTC.
-    # NOTE: git --date is supposed to support the %-m/%-d format too, but it does not seem to
-    # work on Windows. Without it we get leading zeros for month and day.
-    last_commit_date=$(TZ=UTC git show --quiet --date="format-local:%Y-%m-%d" --format="%cd")
-    last_commit_date_stripped=$(date --date="$last_commit_date" "+%Y.%-m.%-d")
-    echo -n "${prerelease_source}.${last_commit_date_stripped}" > prerelease.txt
-fi
+"${ROOTDIR}/scripts/prerelease_suffix.sh" "$prerelease_source" "$CIRCLE_TAG" > prerelease.txt
 
 mkdir build/
 cd build/

scripts/prerelease_suffix.sh

@@ -0,0 +1,27 @@
+#!/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:-}"
+
+GNU_DATE="date"
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    GNU_DATE=gdate
+fi
+
+if [[ $FORCE_RELEASE != "" || $git_tag == v* ]]; then
+    echo -n
+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.
+    # NOTE: The -local suffix makes git not use the timezone from the commit but instead convert to
+    # local one, which we explicitly set to UTC.
+    # NOTE: git --date is supposed to support the %-m/%-d format too, but it does not seem to
+    # work on Windows. Without it we get leading zeros for month and day.
+    last_commit_date=$(TZ=UTC git show --quiet --date="format-local:%Y-%m-%d" --format="%cd")
+    last_commit_date_stripped=$("$GNU_DATE" --date "$last_commit_date" "+%Y.%-m.%-d")
+    echo -n "${prerelease_source}.${last_commit_date_stripped}"
+fi