fix(worfklows): fix concurrency of version bump and release workflows. Version bump now triggers release workflow on success. (#41)

Author: walmsles

.github/workflows/release.yml

@@ -13,8 +13,10 @@ on:
           - patch
           - minor
           - major
-  push:
-    branches: [ main ]
+      version:
+        description: 'Version number (for auto-triggered releases)'
+        required: false
+        type: 'string'
 
 jobs:
   release:
@@ -24,14 +26,13 @@ jobs:
       contents: write
       issues: write
       pull-requests: write
-    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'chore(release)')"
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -70,13 +71,48 @@ jobs:
       - name: Test
         run: pnpm test:ci
 
+      - name: Check for Draft Release
+        if: github.event.inputs.version != ''
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          VERSION="${{ github.event.inputs.version }}"
+          echo "Checking for draft release v$VERSION"
+          
+          # Check if draft release exists
+          RELEASE_EXISTS=$(gh release view v$VERSION --json isDraft 2>/dev/null || echo "{}")
+          IS_DRAFT=$(echo "$RELEASE_EXISTS" | jq -r '.isDraft // false')
+          
+          if [ "$IS_DRAFT" != "true" ]; then
+            echo "No draft release found for v$VERSION, creating one..."
+            gh release create v$VERSION \
+              --draft \
+              --title "v$VERSION" \
+              --notes "Release v$VERSION"
+          else
+            echo "Draft release v$VERSION found"
+          fi
+        
       - name: Release
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ] && [ "${{ github.event.inputs.releaseType }}" != "auto" ]; then
+          if [ "${{ github.event.inputs.releaseType }}" != "auto" ]; then
+            # Manual release with specific type
             pnpm release --release-as ${{ github.event.inputs.releaseType }}
           else
+            # Auto release (triggered by version-bump workflow)
             pnpm release
           fi
+          
+      - name: Publish Draft Release
+        if: github.event.inputs.version != ''
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          VERSION="${{ github.event.inputs.version }}"
+          echo "Publishing draft release v$VERSION"
+          
+          # Convert draft to published release
+          gh release edit v$VERSION --draft=false

.github/workflows/version-bump.yml

@@ -12,14 +12,15 @@ jobs:
       contents: write
       issues: write
       pull-requests: write
+      actions: write  # Added for triggering workflows
     if: '!contains(github.event.head_commit.message, ''skip ci'') && !contains(github.event.head_commit.message, ''chore(release)'')'
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -59,24 +60,27 @@ jobs:
 
       - name: Test Release (Dry Run)
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: pnpm release:dry-run
 
       - name: Update or Create GitHub Release Draft
+        id: create_release
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           # Get the next version from semantic-release
           VERSION=$(npx semantic-release --dry-run | grep -oP 'The next release version is \K[0-9]+\.[0-9]+\.[0-9]+' || echo "")
           
           if [ -z "$VERSION" ]; then
             echo "No version change detected, skipping release creation"
+            echo "version=" >> $GITHUB_OUTPUT
             exit 0
           fi
           
           echo "Next version will be: $VERSION"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
           
           # Update package.json version
           npm version $VERSION --no-git-tag-version
@@ -147,3 +151,13 @@ jobs:
           git add package.json
           git commit -m "chore(release): bump version to $VERSION [skip ci]"
           git push
+          
+      - name: Trigger Release Workflow
+        if: steps.create_release.outputs.version != ''
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "Triggering release workflow for version ${{ steps.create_release.outputs.version }}"
+          gh workflow run release.yml \
+            --field releaseType=auto \
+            --field version=${{ steps.create_release.outputs.version }}