From 43fdeed2ab8784ff737a8c6fcdf88f71b7bee73f Mon Sep 17 00:00:00 2001
From: t8y2 <1156263951@qq.com>
Date: Thu, 30 Jul 2026 11:12:31 +0800
Subject: [PATCH] perf(release): run agent and package workflows concurrently

---
 .github/workflows/agents-release.yml |  69 +++++++++++++--
 .github/workflows/mcp-release.yml    | 122 +++++++++++++++++++++------
 .github/workflows/release.yml        |  12 ++-
 3 files changed, 165 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/agents-release.yml b/.github/workflows/agents-release.yml
index a1cee0a4d..606b3e729 100644
--- a/.github/workflows/agents-release.yml
+++ b/.github/workflows/agents-release.yml
@@ -8,7 +8,7 @@ permissions:
   contents: write
 
 concurrency:
-  group: dbx-release-main
+  group: agents-release
   cancel-in-progress: false
 
 jobs:
@@ -58,15 +58,66 @@ jobs:
 
           node .github/scripts/bump-agent-versions.mjs "${ARGS[@]}"
 
-          if ! git diff --quiet -- agents/versions.json; then
-            git config user.name "github-actions[bot]"
-            git config user.email "github-actions[bot]@users.noreply.github.com"
-            git add agents/versions.json
-            git commit -m "chore: bump module versions [skip ci]"
+      - name: Create agent version patch
+        run: git diff --binary -- agents/versions.json > agent-version-bump.patch
+
+      - name: Upload agent version patch
+        uses: actions/upload-artifact@v4
+        with:
+          name: agent-version-bump
+          path: agent-version-bump.patch
+          retention-days: 1
+
+  commit-versions:
+    name: Commit agent version bump
+    needs: bump-versions
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Download agent version patch
+        uses: actions/download-artifact@v4
+        with:
+          name: agent-version-bump
+
+      - name: Apply and push agent version bump
+        shell: bash
+        run: |
+          set -euo pipefail
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git fetch origin main --no-tags
+          git switch --detach origin/main
+
+          if [ ! -s agent-version-bump.patch ]; then
+            echo "Agent versions are unchanged."
+            exit 0
+          fi
+
+          if git apply --check agent-version-bump.patch; then
+            git apply --index agent-version-bump.patch
+          elif git apply --reverse --check agent-version-bump.patch; then
+            echo "Agent version bump is already present on main."
+            exit 0
+          else
+            echo "::error::Agent version patch no longer applies cleanly to main."
+            exit 1
+          fi
+
+          git commit -m "chore: bump module versions [skip ci]"
+          for attempt in 1 2 3; do
+            if git push origin HEAD:main; then
+              exit 0
+            fi
+            if [ "$attempt" -eq 3 ]; then
+              echo "::error::Unable to push agent version bump after ${attempt} attempts."
+              exit 1
+            fi
             git fetch origin main --no-tags
             git rebase origin/main
-            git push origin HEAD:main
-          fi
+          done
 
   build-agents:
     needs: [bump-versions]
@@ -385,7 +436,7 @@ jobs:
           path: "dbx-jre-*.tar.zst"
 
   release:
-    needs: [bump-versions, build-agents, build-oracle-native, build-xugu-native, build-kingbase-native, build-duckdb-native, build-jre]
+    needs: [bump-versions, commit-versions, build-agents, build-oracle-native, build-xugu-native, build-kingbase-native, build-duckdb-native, build-jre]
     runs-on: ubuntu-latest
     steps:
       - name: Create DBX bot release token
diff --git a/.github/workflows/mcp-release.yml b/.github/workflows/mcp-release.yml
index 40e6e240f..e2ed8962c 100644
--- a/.github/workflows/mcp-release.yml
+++ b/.github/workflows/mcp-release.yml
@@ -13,7 +13,7 @@ permissions:
   id-token: write
 
 concurrency:
-  group: dbx-release-main
+  group: node-packages-release
   cancel-in-progress: false
 
 jobs:
@@ -165,50 +165,116 @@ jobs:
       - name: Build and pack packages
         run: pnpm publish:dry-run
 
-      - name: Configure git author
+      - name: Create package release patch
         run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git diff --binary -- \
+            Cargo.lock \
+            pnpm-lock.yaml \
+            crates/dbx-mcp/Cargo.toml \
+            crates/dbx-cli/Cargo.toml \
+            packages/cli/package.json \
+            packages/cli-*/package.json \
+            packages/mcp-server/package.json \
+            packages/mcp-server/server.json \
+            packages/mcp-*/package.json \
+            > package-release.patch
 
-      - name: Commit package release version
-        run: |
-          VERSION="${{ steps.version.outputs.version }}"
-          git add Cargo.lock pnpm-lock.yaml crates/dbx-mcp/Cargo.toml crates/dbx-cli/Cargo.toml packages/cli/package.json packages/cli-*/package.json packages/mcp-server/package.json packages/mcp-server/server.json packages/mcp-*/package.json
-          if git diff --cached --quiet; then
-            echo "Package versions already committed for ${VERSION}."
-          else
-            git commit -m "chore(packages): release ${VERSION} [skip node-packages-release]"
-          fi
+      - name: Upload package release patch
+        uses: actions/upload-artifact@v4
+        with:
+          name: package-release-patch
+          path: package-release.patch
+          retention-days: 1
 
-      - name: Rebase package release commit and push
+  commit-release:
+    name: Commit package release
+    needs: prepare
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Download package release patch
+        uses: actions/download-artifact@v4
+        with:
+          name: package-release-patch
+
+      - name: Apply package release patch and push
         env:
           RELEASE_TOKEN: ${{ secrets.MCP_RELEASE_TOKEN }}
         run: |
-          TAG="${{ steps.version.outputs.tag }}"
+          set -euo pipefail
+          TAG="${{ needs.prepare.outputs.tag }}"
+          VERSION="${{ needs.prepare.outputs.version }}"
           if [ -n "${RELEASE_TOKEN}" ]; then
             git remote set-url origin "https://x-access-token:${RELEASE_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
           fi
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
           git fetch origin main --no-tags
-          git rebase origin/main
-          REMOTE_TAG_SHA="$(git ls-remote --tags origin "refs/tags/${TAG}" | awk '{print $1}')"
-          HEAD_SHA="$(git rev-parse HEAD)"
-          if [ -n "${REMOTE_TAG_SHA}" ]; then
-            if [ "${REMOTE_TAG_SHA}" != "${HEAD_SHA}" ]; then
-              echo "::error::Remote tag ${TAG} already exists at ${REMOTE_TAG_SHA}, expected ${HEAD_SHA}."
+          git switch --detach origin/main
+
+          if [ -s package-release.patch ]; then
+            if git apply --check package-release.patch; then
+              git apply --index package-release.patch
+            elif git apply --reverse --check package-release.patch; then
+              echo "Package release ${VERSION} is already present on main."
+            else
+              echo "::error::Package release patch no longer applies cleanly to main."
               exit 1
             fi
-            echo "Remote tag ${TAG} already points at ${HEAD_SHA}."
           else
-            git tag -f "${TAG}" "${HEAD_SHA}"
+            echo "Package versions are already ${VERSION}."
           fi
-          git push origin HEAD:main
-          if [ -z "${REMOTE_TAG_SHA}" ]; then
-            git push origin "refs/tags/${TAG}:refs/tags/${TAG}"
+
+          CREATED_RELEASE_COMMIT=false
+          if ! git diff --cached --quiet; then
+            git commit -m "chore(packages): release ${VERSION} [skip node-packages-release]"
+            CREATED_RELEASE_COMMIT=true
+            RELEASE_COMMIT_SHA="$(git rev-parse HEAD)"
+          else
+            RELEASE_COMMIT_SHA="$(git log origin/main -1 --format=%H --fixed-strings --grep="chore(packages): release ${VERSION} [skip node-packages-release]")"
+            if [ -z "${RELEASE_COMMIT_SHA}" ]; then
+              echo "::error::Package versions are already ${VERSION}, but the matching release commit was not found on main."
+              exit 1
+            fi
+            echo "Package release commit already exists at ${RELEASE_COMMIT_SHA}."
           fi
 
+          REMOTE_TAG_SHA="$(git ls-remote --tags origin "refs/tags/${TAG}" | awk '{print $1}')"
+          if [ -n "${REMOTE_TAG_SHA}" ]; then
+            if [ "${REMOTE_TAG_SHA}" != "${RELEASE_COMMIT_SHA}" ]; then
+              echo "::error::Remote tag ${TAG} already exists at ${REMOTE_TAG_SHA}, expected ${RELEASE_COMMIT_SHA}."
+              exit 1
+            fi
+            echo "Remote tag ${TAG} already points at ${RELEASE_COMMIT_SHA}."
+            exit 0
+          fi
+
+          if [ "${CREATED_RELEASE_COMMIT}" = true ]; then
+            for attempt in 1 2 3; do
+              if git push origin HEAD:main; then
+                break
+              fi
+              if [ "$attempt" -eq 3 ]; then
+                echo "::error::Unable to push package release after ${attempt} attempts."
+                exit 1
+              fi
+              git fetch origin main --no-tags
+              git rebase origin/main
+            done
+            RELEASE_COMMIT_SHA="$(git rev-parse HEAD)"
+          fi
+
+          git fetch origin main --no-tags
+          git merge-base --is-ancestor "${RELEASE_COMMIT_SHA}" origin/main
+          git tag "${TAG}" "${RELEASE_COMMIT_SHA}"
+          git push origin "refs/tags/${TAG}:refs/tags/${TAG}"
+
   publish-cli-platforms:
     name: Publish ${{ matrix.package-name }}
-    needs: prepare
+    needs: [prepare, commit-release]
     runs-on: ${{ matrix.runner }}
     env:
       CARGO_INCREMENTAL: "0"
@@ -383,7 +449,7 @@ jobs:
 
   publish-mcp-platforms:
     name: Publish ${{ matrix.package-name }}
-    needs: prepare
+    needs: [prepare, commit-release]
     runs-on: ${{ matrix.runner }}
     env:
       CARGO_INCREMENTAL: "0"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 37d390c3c..ef2cd93b1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -102,7 +102,17 @@ jobs:
             exit 0
           fi
           git commit -m "chore(jdbc): bump plugin version [skip ci]"
-          git push origin HEAD:main
+          for attempt in 1 2 3; do
+            if git push origin HEAD:main; then
+              exit 0
+            fi
+            if [ "$attempt" -eq 3 ]; then
+              echo "::error::Unable to push JDBC plugin version bump after ${attempt} attempts."
+              exit 1
+            fi
+            git fetch origin main --no-tags
+            git rebase origin/main
+          done
 
   build:
     needs: release-ready