]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
ci: Fix version logic in prepare-release for PR workflows
authorJoel Rosdahl <joel@rosdahl.net>
Fri, 5 Sep 2025 20:13:39 +0000 (22:13 +0200)
committerJoel Rosdahl <joel@rosdahl.net>
Fri, 5 Sep 2025 20:13:39 +0000 (22:13 +0200)
ci/prepare-release

index 9734b063fbacef8b292d646f12adb6430cdd4de9..2ac0da099d35545f6ad88bafc2b23e1b20198b2a 100755 (executable)
@@ -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() {