From 8d262834973a061a39c1ce68f66e041b4cc96f35 Mon Sep 17 00:00:00 2001
From: Nhan Phan <nhan.phan@gmail.com>
Date: Wed, 11 Sep 2024 22:41:17 -0700
Subject: [PATCH] nicer tag formatting

---
 .github/workflows/create-release.yml | 6 +++---
 .github/workflows/deploy-program.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 051a292..b2b7768 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -60,7 +60,7 @@ jobs:
     - name: Bump Program Version
       run: |
         git fetch --tags --all
-        VERSION=`git tag -l --sort -version:refname "release/${{ inputs.program }}/*" | head -n 1 | sed 's|release/${{ inputs.program }}/||'`
+        VERSION=`git tag -l --sort -version:refname "release/${{ inputs.program }}@*" | head -n 1 | sed 's|release/${{ inputs.program }}@||'`
         MAJOR=`echo ${VERSION} | cut -d. -f1`
         MINOR=`echo ${VERSION} | cut -d. -f2`
         PATCH=`echo ${VERSION} | cut -d. -f3`
@@ -99,8 +99,8 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        tag_name: release/${{ inputs.program }}/${{ env.PROGRAM_VERSION }}
-        release_name: Release ${{ inputs.program }} v${{ env.PROGRAM_VERSION }}
+        tag_name: release/${{ inputs.program }}@${{ env.PROGRAM_VERSION }}
+        release_name: ${{ inputs.program }} v${{ env.PROGRAM_VERSION }}
         body: |
           Release ${{ inputs.program }} v${{ env.PROGRAM_VERSION }}
         draft: false
diff --git a/.github/workflows/deploy-program.yml b/.github/workflows/deploy-program.yml
index 70494ae..bd7cbf8 100644
--- a/.github/workflows/deploy-program.yml
+++ b/.github/workflows/deploy-program.yml
@@ -24,10 +24,10 @@ on:
           - eclipse-mainnet
           - eclipse-devnet
       git_ref:
-        description: Release tag (release/1.x.x) or commit to deploy
+        description: Release tag (release/candy-machine-core@0.2.1) or (release/candy-guard@0.2.1) or commit to deploy
         required: true
         type: string
-        default: release/1.0.0
+        default: release/candy-guard@0.2.1
       dry_run:
         description: Dry run
         required: false
@@ -63,7 +63,7 @@ jobs:
       - name: Git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.inputs.git_ref }}
+          ref: ${{ inputs.git_ref }}
 
       - name: Load environment variables
         run: cat .github/.env >> $GITHUB_ENV