chore: refine release and sync workflows

- Simplified the release workflow by removing unnecessary output steps and streamlining the version bump process.
- Enhanced the sync-patch workflow to allow cherry-picking commits with improved handling of conflicts and commit messages.
- Updated job names and descriptions for clarity and consistency.

Author: caio-pizzol

.github/workflows/release-stable.yml

@@ -25,9 +25,6 @@ jobs:
   release:
     needs: test
     runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.get-version.outputs.version }}
-      released: ${{ steps.semantic-release.outputs.new-release-published }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -53,80 +50,45 @@ jobs:
           echo "Ref name: ${{ github.ref_name }}"
 
       - name: Release to latest channel
-        id: semantic-release
         env:
           GITHUB_TOKEN: ${{ secrets.SUPERDOC_PAT }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: |
-          # Run semantic-release and capture output
-          npx semantic-release 2>&1 | tee release.log
-          
-          # Check if a new release was published
-          if grep -q "Published release" release.log; then
-            echo "new-release-published=true" >> $GITHUB_OUTPUT
-          else
-            echo "new-release-published=false" >> $GITHUB_OUTPUT
-          fi
+        run: npx semantic-release
 
-      - name: Get released version
-        id: get-version
-        if: steps.semantic-release.outputs.new-release-published == 'true'
-        run: |
-          # Extract version from the latest git tag
-          VERSION=$(git describe --tags --abbrev=0 | sed 's/^v//')
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "Released version: $VERSION"
-
-  bump-next-version:
+  # Simple addition: bump main to next minor after stable release
+  bump-main:
     needs: release
-    if: needs.release.outputs.released == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           token: ${{ secrets.SUPERDOC_PAT }}
-          fetch-depth: 0
           ref: main
-
+      
       - uses: actions/setup-node@v4
         with:
           node-version: 22
           cache: npm
-
-      - name: Setup Git
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-
+      
       - name: Install dependencies
         run: npm ci
-
-      - name: Bump to next minor version
+      
+      - name: Bump to next minor
         run: |
-          # Parse the released version
-          VERSION="${{ needs.release.outputs.version }}"
-          IFS='.' read -r MAJOR MINOR PATCH <<< "$VERSION"
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
           
-          # Calculate next minor version
-          NEXT_MAJOR=$MAJOR
-          NEXT_MINOR=$((MINOR + 1))
-          NEXT_VERSION="${NEXT_MAJOR}.${NEXT_MINOR}.0-next.0"
-          
-          echo "Current stable version: $VERSION"
-          echo "Next development version: $NEXT_VERSION"
+          # Get version from release branch name (e.g., release/v0.16 -> 0.17.0-next.0)
+          BRANCH="${GITHUB_REF#refs/heads/release/v}"
+          IFS='.' read -r MAJOR MINOR <<< "$BRANCH"
+          NEXT_VERSION="$MAJOR.$((MINOR + 1)).0-next.0"
           
           # Update package.json
           cd packages/superdoc
           npm version "$NEXT_VERSION" --no-git-tag-version
           
-          # Commit the change
+          # Commit and push
           git add package.json
-          git commit -m "chore: bump to v${NEXT_VERSION} [skip ci]
-
-          Begin development for v${NEXT_MAJOR}.${NEXT_MINOR}.0 after stable release v${VERSION}"
-          
-          # Push to main
-          git push origin main
-          
-          echo "✅ Successfully bumped main branch to v${NEXT_VERSION}"
+          git commit -m "chore: begin v$NEXT_VERSION development [skip ci]"
+          git push origin main

.github/workflows/sync-patches.yml

@@ -7,41 +7,90 @@ on:
       - 'packages/**'
   workflow_dispatch:
     inputs:
-      version:
-        description: 'Release branch (e.g., release/v0.21, release/v1.0)'
-        required: true
+      commit:
+        description: 'Commit SHA to cherry-pick (optional, defaults to latest)'
+        required: false
         type: string
 
 permissions:
   contents: write
   pull-requests: write
+  issues: write
 
 jobs:
-  create-sync-pr:
-    runs-on: ubuntu-latest    
+  sync-patch:
+    runs-on: ubuntu-latest
+    # Skip if release commit (auto mode only)
+    if: |
+      github.event_name == 'workflow_dispatch' ||
+      (!contains(github.event.head_commit.message, '[skip ci]') &&
+       !contains(github.event.head_commit.message, 'chore(release)') &&
+       (contains(github.event.head_commit.message, 'fix:') || 
+        contains(github.event.head_commit.message, 'fix(')))
+    
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.SUPERDOC_PAT }}
-      
-      - name: Create sync PR
+
+      - name: Cherry-pick to main
         env:
           GH_TOKEN: ${{ secrets.SUPERDOC_PAT }}
         run: |
-          BRANCH=${{ inputs.version }}
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          
+          # Determine commit to cherry-pick
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ] && [ -n "${{ inputs.commit }}" ]; then
+            COMMIT="${{ inputs.commit }}"
+          else
+            COMMIT="${{ github.sha }}"
+          fi
           
-          # Create PR (or update existing)
-          gh pr create \
-            --base main \
-            --head "$BRANCH" \
-            --title "🔄 Sync: $BRANCH → main" \
-            --body "Auto-sync patches from release branch.
+          # Create patch branch from main
+          git fetch origin main
+          PATCH_BRANCH="patch-${COMMIT:0:7}"
+          git checkout -b "$PATCH_BRANCH" origin/main
+          
+          # Try cherry-pick
+          if git cherry-pick "$COMMIT"; then
+            # Success - push and create PR
+            git push origin "$PATCH_BRANCH"
+            
+            # Get commit message
+            COMMIT_MSG=$(git log -1 --pretty=format:"%s" "$COMMIT")
             
-            **Branch:** $BRANCH
-            **Commits:** ${{ github.event.head_commit.message }}
+            gh pr create \
+              --base main \
+              --head "$PATCH_BRANCH" \
+              --title "🔄 $COMMIT_MSG" \
+              --body "Cherry-pick fix from ${{ github.ref_name }}
+              
+              Original commit: $COMMIT
+              
+              This PR cherry-picks a fix from the release branch to main." \
+              --label "patch-sync" \
+              --label "automerge"
+          else
+            # Conflict - create issue for manual resolution
+            COMMIT_MSG=$(git log -1 --pretty=format:"%s" "$COMMIT" || echo "Unknown commit")
             
-            This PR will auto-merge after tests pass." \
-            --label "patch-sync" \
-          || gh pr edit \
-            --add-label "patch-sync"
+            gh issue create \
+              --title "🔄 Manual sync needed: $COMMIT_MSG" \
+              --body "Failed to auto-sync patch from ${{ github.ref_name }} due to conflicts.
+              
+              **Commit**: $COMMIT
+              **Branch**: ${{ github.ref_name }}
+              
+              Please manually cherry-pick this fix to main:
+              \`\`\`bash
+              git checkout main
+              git pull
+              git cherry-pick $COMMIT
+              # Resolve conflicts, then:
+              git push
+              \`\`\`" \
+              --label "patch-sync" \
+              --label "needs-manual-sync"
+          fi