From 5d9d8dbe9dffc9ad556f099a915b25f6025f25f9 Mon Sep 17 00:00:00 2001
From: Wesley van Tilburg <justwesley@protonmail.com>
Date: Mon, 21 Sep 2026 18:13:49 +0200
Subject: [PATCH] ci: make build IDs unique per run

Date-only build IDs collided on same-day rebuilds, so release tags already
existed and the changelog/release step was skipped. Use the CI run number
(timestamp fallback locally).
---
 build.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 607dd17..22d2097 100755
--- a/build.sh
+++ b/build.sh
@@ -47,7 +47,13 @@ CACHE_DIR="${REPO_ROOT}/cache"
 
 [[ -n "${BUILD_MODE}" ]] || { echo "BUILD_MODE not set in ${CONF}" >&2; exit 1; }
 
-buildid="$(date '+%Y%m%d.0')"
+# Build IDs must be unique per build (release tags are derived from them), so
+# include the CI run number when available, otherwise a timestamp.
+if [[ -n "${GITHUB_RUN_NUMBER:-}" ]]; then
+  buildid="$(date '+%Y%m%d').${GITHUB_RUN_NUMBER}"
+else
+  buildid="$(date '+%Y%m%d.%H%M%S')"
+fi
 echo "${buildid}" > "${REPO_ROOT}/.buildid"
 
 rm -rf "${BUILD_DIR}"