Fix version naming issue

Author: Joe3112

.github/workflows/deploy.yml

@@ -28,27 +28,38 @@ jobs:
         id: ver
         shell: bash
         run: |
-          # versionName
-          if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
-            VERSION_NAME="${GITHUB_REF#refs/tags/v}"     # v1.4.2 -> 1.4.2
+          REF="${GITHUB_REF}"  # e.g. refs/heads/release/v0.1.0
+
+          if [[ "$REF" == refs/heads/release/* ]]; then
+            # Extract version string after "release/"
+            VERSION_TAG="${REF#refs/heads/release/}"   # v0.1.0
+            VERSION_NAME="${VERSION_TAG#v}"            # 0.1.0
           else
+            # Non-release branches: snapshot
             LAST_TAG="$(git describe --tags --abbrev=0 2>/dev/null || echo v0.0.0)"
             VERSION_NAME="${LAST_TAG#v}-SNAPSHOT+${GITHUB_SHA::7}"
+            VERSION_TAG="v${VERSION_NAME%%-*}" # v0.0.0 for reference; won't be used to tag
           fi
-          
-          # A) From SemVer (x.y.z -> x*10000 + y*100 + z)
-          MAJOR="${VERSION_NAME%%.*}"; rest="${VERSION_NAME#*.}"
-          MINOR="${rest%%.*}"; PATCH="${rest#*.}"
-          PATCH="${PATCH%%-*}" # strip -SNAPSHOT if present
+
+          # Compute a safe, monotonic versionCode
+          # Prefer SemVer encoding when VERSION_NAME is x.y.z (not snapshot)
+          BASE_NAME="${VERSION_NAME%%-*}"          # strip -SNAPSHOT if present
+          IFS='.' read -r MAJOR MINOR PATCH <<< "$BASE_NAME"
+
           if [[ "$MAJOR" =~ ^[0-9]+$ && "$MINOR" =~ ^[0-9]+$ && "$PATCH" =~ ^[0-9]+$ ]]; then
             VC=$((10#${MAJOR}*10000 + 10#${MINOR}*100 + 10#${PATCH}))
           else
-            # B) Fallback for snapshots: time-based code (UTC yyyymmddHH)
+            # Fallback for snapshots or odd formats
             VC="$(date -u +%Y%m%d%H)"
           fi
-          
-          echo "version_name=${VERSION_NAME}" >> $GITHUB_OUTPUT
-          echo "version_code=${VC}" >> $GITHUB_OUTPUT  
+
+          echo "version_name=$VERSION_NAME" >> "$GITHUB_OUTPUT"
+          echo "version_code=$VC" >> "$GITHUB_OUTPUT"
+          echo "version_tag=$VERSION_TAG" >> "$GITHUB_OUTPUT"
+
+          echo "Derived VERSION_NAME=$VERSION_NAME"
+          echo "Derived VERSION_CODE=$VC"
+          echo "Derived VERSION_TAG=$VERSION_TAG"
 
       - name: Assemble Release Bundle
         env:
@@ -72,8 +83,16 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
 
       - name: Tag Release
+        env:
+          VERSION_TAG: ${{ steps.ver.outputs.version_tag }}
         run: |
-          version_name=${GITHUB_REF##*/}
+          # Safety: don't recreate if already exists
+          if git ls-remote --tags origin | grep -q "refs/tags/${VERSION_TAG}$"; then
+            echo "Tag ${VERSION_TAG} already exists on remote. Skipping."
+            exit 0
+          fi
+          
+          version_name=${VERSION_TAG}
           echo "Tagging release with tag $version_name"
           git tag $version_name release/$version_name
           git push origin --tags