From 211153fcd5d9e6d01cb2b61847d8e401e67c5e96 Mon Sep 17 00:00:00 2001
From: Dave Allie <dave@daveallie.com>
Date: Fri, 6 Feb 2026 03:49:00 +1100
Subject: [PATCH] Use GITHUB_HEAD_REF

---
 .github/workflows/release_candidate.yml | 4 ++--
 platformio.ini                          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release_candidate.yml b/.github/workflows/release_candidate.yml
index 8f704484..e9bbc636 100644
--- a/.github/workflows/release_candidate.yml
+++ b/.github/workflows/release_candidate.yml
@@ -28,8 +28,8 @@ jobs:
 
       - name: Extract env
         run: |
-          echo "SHORT_SHA=${GITHUB_SHA::6}" >> $GITHUB_ENV
-          echo "BRANCH_SUFFIX=${GITHUB_REF_NAME#release/}" >> $GITHUB_ENV
+          echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
+          echo "BRANCH_SUFFIX=${GITHUB_HEAD_REF#release/}" >> $GITHUB_ENV
 
       - name: Build CrossPoint Release Candidate
         env:
diff --git a/platformio.ini b/platformio.ini
index c4b992e8..c441e526 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -65,4 +65,4 @@ build_flags =
 extends = base
 build_flags =
   ${base.build_flags}
-  -DCROSSPOINT_VERSION=\"${crosspoint.version}-rc-${sysenv.CROSSPOINT_RC_HASH}\"
+  -DCROSSPOINT_VERSION=\"${crosspoint.version}-rc+${sysenv.CROSSPOINT_RC_HASH}\"