From 6f92c195ac9b1582f20ced68569f103e8622a3c9 Mon Sep 17 00:00:00 2001
From: ntkathole <nikhilkathole2683@gmail.com>
Date: Wed, 9 Jul 2025 20:07:14 +0530
Subject: [PATCH] fix: Fix release version without prefix

Signed-off-by: ntkathole <nikhilkathole2683@gmail.com>
---
 .github/workflows/publish_web_ui.yml | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/publish_web_ui.yml b/.github/workflows/publish_web_ui.yml
index 6fcdf241e9a..03965486ae3 100644
--- a/.github/workflows/publish_web_ui.yml
+++ b/.github/workflows/publish_web_ui.yml
@@ -9,7 +9,7 @@ on:
         type: string
       token:
         description: 'Personal Access Token'
-        required: true
+        required: false
         default: ""
         type: string
       publish_ui:
@@ -25,7 +25,7 @@ on:
         type: string
       token:
         description: 'Personal Access Token'
-        required: true
+        required: false
         default: ""
         type: string
       publish_ui:
@@ -43,20 +43,32 @@ jobs:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
     steps:
       - uses: actions/checkout@v4
-      - id: get-version
+      - id: get-current-version
+        if: github.event.inputs.custom_version != ''
         uses: ./.github/actions/get-semantic-release-version
         with:
-          custom_version: ${{ github.event.inputs.custom_version }}
           token: ${{ github.event.inputs.token || github.token }}
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
           node-version-file: './ui/.nvmrc'
       - name: Bump file versions (temporarily for Web UI publish)
+        if: github.event.inputs.custom_version != ''
         env:
-          CURRENT_VERSION: ${{ steps.get-version.outputs.highest_semver_tag }}
-          NEXT_VERSION: ${{ steps.get-version.outputs.version_without_prefix }}
-        run: python ./infra/scripts/release/bump_file_versions.py ${CURRENT_VERSION} ${NEXT_VERSION}
+          CUSTOM_VERSION: ${{ github.event.inputs.custom_version }}
+        run: |
+          # Get current version from action output (already normalized without 'v' prefix)
+          CURRENT_VERSION="${{ steps.get-current-version.outputs.version_without_prefix }}"
+          
+          # Normalize custom version (next version) by removing 'v' prefix if present
+          NEXT_VERSION="${CUSTOM_VERSION}"
+          if [[ "$NEXT_VERSION" =~ ^v ]]; then
+            NEXT_VERSION="${NEXT_VERSION:1}"
+          fi
+          
+          echo "Using current version from action: $CURRENT_VERSION"
+          echo "Using next version (custom): $NEXT_VERSION"
+          python ./infra/scripts/release/bump_file_versions.py ${CURRENT_VERSION} ${NEXT_VERSION}
       - name: Install yarn dependencies
         working-directory: ./ui
         run: yarn install