fix: simplify workflow

Author: madhur310

.github/workflows/npm-publish.yml

@@ -3,7 +3,7 @@ name: npm-publish
 on:
   workflow_call:
     inputs:
-      branch:
+      tag:
         required: true
         type: string
       nodeVersion:
@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ inputs.branch }}
+          ref: ${{ inputs.tag }}
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -41,21 +41,8 @@ jobs:
         run: npm run build
 
       - name: Determine npm dist-tag
+        uses: salesforcecli/github-workflows/.github/actions/getPreReleaseTag@main
         id: distTag
-        run: |
-          # Extract version from package.json
-          VERSION=$(node -p "require('./package.json').version")
-          echo "Version: $VERSION"
-
-          # Check if version contains prerelease identifiers
-          if [[ "$VERSION" =~ -([a-zA-Z]+) ]]; then
-            DIST_TAG="${BASH_REMATCH[1]}"
-            echo "Detected prerelease tag: $DIST_TAG"
-            echo "tag=$DIST_TAG" >> $GITHUB_OUTPUT
-          else
-            echo "Detected stable release, using 'latest' tag"
-            echo "tag=latest" >> $GITHUB_OUTPUT
-          fi
 
       - name: Publish to npm
         run: npm publish --access public --tag ${{ steps.distTag.outputs.tag }}

.github/workflows/onRelease.yml

@@ -10,43 +10,25 @@ on:
         description: tag that needs to publish
         type: string
         required: true
+
 jobs:
   # parses the package.json version and detects prerelease tag (ex: beta from 4.4.4-beta.0)
   getDistTag:
     outputs:
       tag: ${{ steps.distTag.outputs.tag }}
-      branch: ${{ steps.getBranch.outputs.branch }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.release.tag_name || inputs.tag  }}
+          ref: ${{ github.event.release.tag_name || inputs.tag }}
       - uses: salesforcecli/github-workflows/.github/actions/getPreReleaseTag@main
         id: distTag
-      - name: Determine branch
-        id: getBranch
-        run: |
-          if [[ "${{ github.event_name }}" == "release" ]]; then
-            # For release events, use the target branch of the release
-            BRANCH="${{ github.event.release.target_commitish }}"
-          else
-            # For workflow_dispatch, use the current branch
-            BRANCH="${{ github.ref_name }}"
-          fi
-
-          # Use main if triggered from main, otherwise use prerelease/dev
-          if [[ "$BRANCH" == "main" ]]; then
-            echo "branch=main" >> $GITHUB_OUTPUT
-          else
-            echo "branch=prerelease/dev" >> $GITHUB_OUTPUT
-          fi
-          echo "Detected branch: $BRANCH, using: $(cat $GITHUB_OUTPUT | grep branch | cut -d'=' -f2)"
 
   npm-publish:
     if: ${{ needs.getDistTag.outputs.tag != '' }}
     uses: ./.github/workflows/npm-publish.yml
     needs: [getDistTag]
     with:
-      branch: ${{ needs.getDistTag.outputs.branch }}
+      tag: ${{ needs.getDistTag.outputs.tag }}
       nodeVersion: 'lts/*'
     secrets: inherit