Merge branch 'master' into fix/issue-6025-webhook-up-notification

.github/workflows/beta-release.yml

@@ -41,9 +41,11 @@ jobs:
       - name: Create release branch
         env:
           VERSION: ${{ inputs.version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
+          git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git"
           # Delete remote branch if it exists
           git push origin --delete "release-${VERSION}" || true
           # Delete local branch if it exists

extra/beta/update-version.js

@@ -58,8 +58,8 @@ function commit(version) {
         throw new Error("commit error");
     }
 
-    res = childProcess.spawnSync("git", ["push", "origin", "master"]);
-    console.log(res.stdout.toString().trim());
+    // 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
 }
 
 /**

extra/release/beta.mjs

@@ -13,7 +13,6 @@ import {
     createReleasePR,
 } from "./lib.mjs";
 import semver from "semver";
-import { spawnSync } from "node:child_process";
 
 const repoNames = getRepoNames();
 const version = process.env.RELEASE_BETA_VERSION;
@@ -51,10 +50,7 @@ await checkTagExists(repoNames, version);
 // node extra/beta/update-version.js
 execSync("node ./extra/beta/update-version.js");
 
-// Git Push
-spawnSync("git", ["push", "origin", branchName], { stdio: "inherit" });
-
-// Create Pull Request
+// Create Pull Request (gh pr create will handle pushing the branch)
 await createReleasePR(version, previousVersion, dryRun, branchName, githubRunId);
 
 // Build frontend dist