From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 5 Sep 2025 20:13:39 +0000 (+0200)
Subject: ci: Fix version logic in prepare-release for PR workflows
X-Git-Tag: v4.12~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea1ee0875d6854953a10ccad1ddc68774c68abf9;p=thirdparty%2Fccache.git

ci: Fix version logic in prepare-release for PR workflows
---

diff --git a/ci/prepare-release b/ci/prepare-release
index 9734b063..2ac0da09 100755
--- a/ci/prepare-release
+++ b/ci/prepare-release
@@ -3,9 +3,14 @@
 set -euxo pipefail
 
 if [[ ${GITHUB_REF} = refs/tags/v* ]]; then
-    VERSION=${GITHUB_REF#refs/tags/v}
+    VERSION="${GITHUB_REF#refs/tags/v}"
 else
-    VERSION=${GITHUB_REF_NAME}.$(git rev-parse --short=8 @)
+    hash=$(git rev-parse --short=8 @)
+    if [[ ${GITHUB_REF} =~ ^refs/pull/([^/]+)/merge$ ]]; then
+        VERSION="${BASH_REMATCH[1]}.${hash}"
+    else
+        VERSION="${GITHUB_REF_NAME}.$(git rev-parse --short=8 @)"
+    fi
 fi
 
 prepare_source_release() {