chore: merge main into release for new releases

Author: Marfuen

.github/workflows/release.yml

@@ -37,39 +37,37 @@ jobs:
           HUSKY: 0
         run: bun run semantic-release
 
-      - name: Get version after release
-        id: version_after
-        if: ${{ success() }}
-        run: echo "version=$(git describe --tags --abbrev=0 2>/dev/null || echo '')" >> $GITHUB_OUTPUT
-
-      - name: Get release notes
-        id: get_notes
-        if: ${{ success() && steps.version_after.outputs.version && steps.version_before.outputs.version != steps.version_after.outputs.version }}
+      - name: Check if release was created
+        id: check_release
         run: |
-          NOTES=$(gh release view ${{ steps.version_after.outputs.version }} --json body -q .body | head -c 3900)
-          # Escape for JSON and handle multiline
-          NOTES=$(echo "$NOTES" | jq -Rs . | sed 's/^"//;s/"$//')
-          echo "notes<<EOF" >> $GITHUB_OUTPUT
-          echo "$NOTES" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Get the latest version after semantic-release
+          VERSION_AFTER=$(git describe --tags --abbrev=0 2>/dev/null || echo '')
+          echo "version_after=$VERSION_AFTER" >> $GITHUB_OUTPUT
 
-      - name: Send Discord notification
-        if: ${{ success() && steps.version_after.outputs.version && steps.version_before.outputs.version != steps.version_after.outputs.version }}
-        continue-on-error: true
+          # Check if version changed
+          if [ "${{ steps.version_before.outputs.version }}" != "$VERSION_AFTER" ] && [ ! -z "$VERSION_AFTER" ]; then
+            echo "release_created=true" >> $GITHUB_OUTPUT
+          else
+            echo "release_created=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Merge release back to main
+        if: ${{ steps.check_release.outputs.release_created == 'true' }}
         env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-          VERSION: ${{ steps.version_after.outputs.version }}
-          NOTES: ${{ steps.get_notes.outputs.notes }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
         run: |
-          curl -X POST -H "Content-Type: application/json" \
-            -d @- "$DISCORD_WEBHOOK" <<EOF
-          {
-            "embeds": [{
-              "title": "New Release of Comp AI: ${VERSION}",
-              "description": "${NOTES}",
-              "color": 5814783
-            }]
-          }
-          EOF
+          # Configure git
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+          # Fetch all branches to ensure we have latest
+          git fetch origin
+
+          # Checkout main
+          git checkout -B main origin/main
+
+          # Merge release branch (which now has the new release commits)
+          git merge --no-ff origin/release -m "chore: merge release ${{ steps.check_release.outputs.version_after }} back to main [skip ci]"
+
+          # Push to main
+          git push origin main

.gitignore

@@ -80,4 +80,7 @@ debug-setup-page.png
 packages/*/dist
 
 # Generated Prisma Client
-**/src/db/generated/
+**/src/db/generated/
+
+# Release script
+scripts/sync-release-branch.sh

apps/app/package.json

@@ -40,10 +40,10 @@
     "@t3-oss/env-nextjs": "^0.13.8",
     "@tanstack/react-query": "^5.74.4",
     "@tanstack/react-table": "^8.21.3",
-    "@tiptap/extension-table": "^2.22.3",
-    "@tiptap/extension-table-cell": "^2.22.3",
-    "@tiptap/extension-table-header": "^2.22.3",
-    "@tiptap/extension-table-row": "^2.22.3",
+    "@tiptap/extension-table": "^3.4.4",
+    "@tiptap/extension-table-cell": "^3.4.4",
+    "@tiptap/extension-table-header": "^3.4.4",
+    "@tiptap/extension-table-row": "^3.4.4",
     "@trigger.dev/react-hooks": "4.0.0",
     "@trigger.dev/sdk": "4.0.0",
     "@trycompai/db": "^1.3.4",