From b2d7031522121991ed9ea8fac02010010b915f80 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 14 Jan 2026 10:28:34 +0800
Subject: [PATCH] fix: final fix of beta workflow (#6713)

---
 .github/workflows/beta-release.yml                   |  3 ++-
 extra/beta/{update-version.js => update-version.mjs} | 12 ++++++++++--
 extra/release/beta.mjs                               |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
 rename extra/beta/{update-version.js => update-version.mjs} (83%)

diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml
index fa8b0f412..ff40e86e6 100644
--- a/.github/workflows/beta-release.yml
+++ b/.github/workflows/beta-release.yml
@@ -50,7 +50,8 @@ jobs:
           git push origin --delete "release-${VERSION}" || true
           # Delete local branch if it exists
           git branch -D "release-${VERSION}" || true
-          # Create new branch from master
+          # For testing purpose
+          # git checkout beta-workflow
           git checkout -b "release-${VERSION}"
 
       - name: Install dependencies
diff --git a/extra/beta/update-version.js b/extra/beta/update-version.mjs
similarity index 83%
rename from extra/beta/update-version.js
rename to extra/beta/update-version.mjs
index 5465763df..116824dd7 100644
--- a/extra/beta/update-version.js
+++ b/extra/beta/update-version.mjs
@@ -1,3 +1,6 @@
+import { createRequire } from "module";
+const require = createRequire(import.meta.url);
+
 const pkg = require("../../package.json");
 const fs = require("fs");
 const childProcess = require("child_process");
@@ -58,8 +61,13 @@ function commit(version) {
         throw new Error("commit error");
     }
 
-    // Note: Push is handled by gh pr create in the release script
-    // No need to push here as we're on a release branch, not master
+    // Get the current branch name
+    res = childProcess.spawnSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
+    let branchName = res.stdout.toString().trim();
+    console.log("Current branch:", branchName);
+
+    // Git push the branch
+    childProcess.spawnSync("git", ["push", "origin", branchName, "--force"], { stdio: "inherit" });
 }
 
 /**
diff --git a/extra/release/beta.mjs b/extra/release/beta.mjs
index d951bcba8..9e3d86848 100644
--- a/extra/release/beta.mjs
+++ b/extra/release/beta.mjs
@@ -48,7 +48,7 @@ checkDocker();
 await checkTagExists(repoNames, version);
 
 // node extra/beta/update-version.js
-execSync("node ./extra/beta/update-version.js");
+await import("../beta/update-version.mjs");
 
 // Create Pull Request (gh pr create will handle pushing the branch)
 await createReleasePR(version, previousVersion, dryRun, branchName, githubRunId);