fix: exit pre-release mode

Author: MartianGreed

.github/workflows/release.yaml

@@ -113,7 +113,7 @@ jobs:
             
             # Extract version from branch name if it's a release branch
             if [[ "$CURRENT_BRANCH" =~ ^release/([0-9]+\.[0-9]+) ]]; then
-              echo "prerelease_tag=${BASH_REMATCH[1]}-rc" >> $GITHUB_OUTPUT
+              echo "prerelease_tag=rc" >> $GITHUB_OUTPUT
             else
               # Use branch name as prerelease tag (sanitized)
               SANITIZED_BRANCH=$(echo "$CURRENT_BRANCH" | sed 's/[^a-zA-Z0-9-]/-/g')
@@ -140,16 +140,59 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
-      - name: Enter prerelease mode if needed
-        if: steps.release-strategy.outputs.use_prerelease == 'true'
+      - name: Check current prerelease state
+        id: check-prerelease
         run: |
-          PRERELEASE_TAG="${{ steps.release-strategy.outputs.prerelease_tag }}"
-          echo "Entering prerelease mode with tag: $PRERELEASE_TAG"
+          if [ -f .changeset/pre.json ]; then
+            echo "Currently in prerelease mode"
+            echo "in_prerelease=true" >> $GITHUB_OUTPUT
+            # Extract the current prerelease tag from pre.json
+            CURRENT_TAG=$(node -e "console.log(JSON.parse(require('fs').readFileSync('.changeset/pre.json', 'utf8')).tag)")
+            echo "current_tag=$CURRENT_TAG" >> $GITHUB_OUTPUT
+          else
+            echo "Not in prerelease mode"
+            echo "in_prerelease=false" >> $GITHUB_OUTPUT
+          fi
 
+      - name: Exit prerelease mode if transitioning to normal release
+        if: steps.check-prerelease.outputs.in_prerelease == 'true' && steps.release-strategy.outputs.use_prerelease == 'false'
+        run: |
+          echo "Exiting prerelease mode to perform normal release"
           if [ "${{ github.event.inputs.dry_run }}" != "true" ]; then
-            pnpm changeset pre enter "$PRERELEASE_TAG"
+            pnpm changeset pre exit
+            # Commit the pre.json removal
+            git add .
+            git commit -m "chore: exit prerelease mode" || true
+          else
+            echo "DRY RUN: Would exit prerelease mode"
+          fi
+
+      - name: Enter or update prerelease mode if needed
+        if: steps.release-strategy.outputs.use_prerelease == 'true'
+        run: |
+          PRERELEASE_TAG="${{ steps.release-strategy.outputs.prerelease_tag }}"
+          
+          # Check if we're already in prerelease mode with the same tag
+          if [ "${{ steps.check-prerelease.outputs.in_prerelease }}" == "true" ]; then
+            if [ "${{ steps.check-prerelease.outputs.current_tag }}" == "$PRERELEASE_TAG" ]; then
+              echo "Already in prerelease mode with tag: $PRERELEASE_TAG"
+            else
+              echo "Switching prerelease tag from ${{ steps.check-prerelease.outputs.current_tag }} to $PRERELEASE_TAG"
+              if [ "${{ github.event.inputs.dry_run }}" != "true" ]; then
+                # Exit current prerelease mode and enter new one
+                pnpm changeset pre exit
+                pnpm changeset pre enter "$PRERELEASE_TAG"
+              else
+                echo "DRY RUN: Would switch prerelease tag to $PRERELEASE_TAG"
+              fi
+            fi
           else
-            echo "DRY RUN: Would enter prerelease mode with tag $PRERELEASE_TAG"
+            echo "Entering prerelease mode with tag: $PRERELEASE_TAG"
+            if [ "${{ github.event.inputs.dry_run }}" != "true" ]; then
+              pnpm changeset pre enter "$PRERELEASE_TAG"
+            else
+              echo "DRY RUN: Would enter prerelease mode with tag $PRERELEASE_TAG"
+            fi
           fi
 
       - name: Check for changesets
@@ -223,18 +266,6 @@ jobs:
           pnpm changeset tag
           git push --tags
 
-      - name: Exit prerelease mode if needed
-        if: steps.release-strategy.outputs.use_prerelease == 'true' && github.event.inputs.dry_run != 'true' && steps.check-changesets.outputs.has_changesets == 'true'
-        run: |
-          echo "Exiting prerelease mode"
-          pnpm changeset pre exit || true
-          # Commit the pre.json removal if it exists
-          if [ -f .changeset/pre.json ]; then
-            git add .changeset/pre.json
-            git commit -m "chore: exit prerelease mode" || true
-            CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-            git push origin "refs/heads/$CURRENT_BRANCH:refs/heads/$CURRENT_BRANCH" || true
-          fi
 
       - name: Trigger release creation
         if: ${{ github.event.inputs.dry_run != 'true' && steps.check-changesets.outputs.has_changesets == 'true' }}
@@ -258,17 +289,16 @@ jobs:
         run: |
           echo "DRY RUN SUMMARY:"
           echo "================"
-          if [ "${{ steps.release-strategy.outputs.use_prerelease }}" == "true" ]; then
+          if [ "${{ steps.check-prerelease.outputs.in_prerelease }}" == "true" ] && [ "${{ steps.release-strategy.outputs.use_prerelease }}" == "false" ]; then
+            echo "Would exit prerelease mode before versioning"
+          fi
+          if [ "${{ steps.release-strategy.outputs.use_prerelease }}" == "true" ] && [ "${{ steps.check-prerelease.outputs.in_prerelease }}" == "false" ]; then
             echo "Would enter prerelease mode: ${{ steps.release-strategy.outputs.prerelease_tag }}"
           fi
           echo "Would version packages according to changesets"
           echo "Would commit with message: chore: release"
           echo "Would create and push tags"
           echo "Would publish packages to npm"
-
-          if [ "${{ steps.release-strategy.outputs.use_prerelease }}" == "true" ]; then
-            echo "Would exit prerelease mode after publishing"
-          fi
           echo ""
           echo "Current git status:"
           git status