From 9e58651b49f9eacd2252b859722d973bf1dd3b90 Mon Sep 17 00:00:00 2001
From: aboyko <alex.boyko@broadcom.com>
Date: Sun, 14 Jul 2024 13:23:54 -0400
Subject: [PATCH] [GHA] Add `tag` parameter to vscode release job for testing
 purposes

---
 .github/scripts/build-vscode-extension.sh     | 24 +++++++++----------
 .../workflows/release-vscode-extension.yml    | 13 +++++++---
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/.github/scripts/build-vscode-extension.sh b/.github/scripts/build-vscode-extension.sh
index 5aaa64511..9c57e582d 100755
--- a/.github/scripts/build-vscode-extension.sh
+++ b/.github/scripts/build-vscode-extension.sh
@@ -39,18 +39,18 @@ fi
 
 # for release build we don't add version-qualifier to package.json
 # So we must instead rename the file ourself to add a qualifier
-if [ "$dist_type" == release ]; then
-    vsix_file=`ls *.vsix`
-    git fetch --tags
-    release_name=`git tag --points-at HEAD | grep ${extension_id}`
-    echo "release_name=$release_name"
-    if [ -z "$release_name" ]; then
-        echo "Release Candidates must be tagged" >&2
-        exit 1
-    else
-        mv $vsix_file ${release_name}.vsix
-    fi
-fi
+#if [ "$dist_type" == release ]; then
+#    vsix_file=`ls *.vsix`
+#    git fetch --tags
+#    release_name=`git tag --points-at HEAD | grep ${extension_id}`
+#    echo "release_name=$release_name"
+#    if [ -z "$release_name" ]; then
+#        echo "Release Candidates must be tagged" >&2
+#        exit 1
+#    else
+#        mv $vsix_file ${release_name}.vsix
+#    fi
+#fi
 
 mkdir -p $workdir/vsix
 cp *.vsix $workdir/vsix
diff --git a/.github/workflows/release-vscode-extension.yml b/.github/workflows/release-vscode-extension.yml
index 54578763e..789ca4ebc 100644
--- a/.github/workflows/release-vscode-extension.yml
+++ b/.github/workflows/release-vscode-extension.yml
@@ -11,6 +11,10 @@ on:
         description: For example "RC1"
         required: true
         type: string
+      tag:
+        description: tag the git repo if value is 'true'
+        required: true
+        type: boolean
 
 permissions:
   contents: write
@@ -34,16 +38,19 @@ jobs:
         id: version
         run: |
           base_version=`jq -r .version vscode-extensions/${{ inputs.extension-name }}/package.json`
+          release_name=${{ inputs.extension-name }}-${{ steps.version.outputs.version }}-${{ inputs.postfix }}
           echo "Version: ${base_version}"
           echo "version=$base_version" >> $GITHUB_OUTPUT
+          echo "release_name=$release_name" >> $GITHUB_OUTPUT
       - name: Create tag
+        if: ${{ inputs.tag }}
         uses: actions/github-script@v7
         with:
           script: |
             github.rest.git.createRef({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              ref: 'refs/tags/${{ inputs.extension-name }}-${{ steps.version.outputs.version }}-${{ inputs.postfix }}',
+              ref: 'refs/tags/${{ steps.version.outputs.release_name }}',
               sha: context.sha
             })
       - name: Set up JDK 17
@@ -64,8 +71,8 @@ jobs:
           s3_path=release/vscode-extensions/${{ inputs.extension-name }}/${{ steps.version.outputs.version }}
           echo "S3 path: ${s3_path}"
           aws s3 rm s3://$AWS_S3_BUCKET/$s3_path/ --recursive
-          aws s3 cp ./vsix/$vsix_file s3://$AWS_S3_BUCKET/$s3_path/$vsix_file --no-progress
-          echo "s3_url=${DOWNLOAD_URL_ROOT}/$s3_path/$vsix_file" >> $GITHUB_OUTPUT
+          aws s3 cp ./vsix/$vsix_file s3://$AWS_S3_BUCKET/$s3_path/${{ steps.version.outputs.release_name }}.vsix --no-progress
+          echo "s3_url=${DOWNLOAD_URL_ROOT}/$s3_path/${{ steps.version.outputs.release_name }}.vsix" >> $GITHUB_OUTPUT
       - id: tools-team-slack
         uses: slackapi/slack-github-action@v1.26
         env: