.ci/tasks/build.sh

@@ -24,10 +24,13 @@ PR=${PR:-}
 if [ -n "$PR" ]; then
     title "PR: $(echo "$PR" | jq '.number') - $(echo "$PR" | jq '.title')"
     ref="pr-$(echo "$PR" | jq '.number')-$(git rev-parse --short "$(cat .git/ref || echo "HEAD")" 2>/dev/null || echo 'manual')"
-elif [ -f ".git/branch"]; then
-    ref=$(cat .git/branch)-$(git rev-parse --short $ref)
 else
-    ref=$(git rev-parse --short "$(cat .git/ref || echo "HEAD")")
+    ref=$(cat .git/ref || echo "HEAD")
+    branch=$(git rev-parse --abbrev-ref $ref)
+    if [ -z "$branch" ]; then
+        branch=$(cat .git/ref)
+    fi
+    ref=${branch}-$(git rev-parse --short $ref)
 fi
 
 title "Version: '$ref'"