From e232c1d5ba08c88ac88903cd5d64532991130a87 Mon Sep 17 00:00:00 2001 From: matt korwel Date: Fri, 19 Sep 2025 01:35:45 -0700 Subject: [PATCH] continue (#8886) Co-authored-by: gemini-cli-robot --- .github/workflows/release-patch-1-create-pr.yml | 2 -- scripts/releasing/create-patch-pr.js | 12 +----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/release-patch-1-create-pr.yml b/.github/workflows/release-patch-1-create-pr.yml index 202a7bfaeb..82e6c57880 100644 --- a/.github/workflows/release-patch-1-create-pr.yml +++ b/.github/workflows/release-patch-1-create-pr.yml @@ -57,8 +57,6 @@ jobs: run: |- git config user.name "gemini-cli-robot" git config user.email "gemini-cli-robot@google.com" - # Configure git to use GITHUB_TOKEN for remote operations (has actions:write for workflow files) - git remote set-url origin "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" - name: 'Create Patch' id: 'create_patch' diff --git a/scripts/releasing/create-patch-pr.js b/scripts/releasing/create-patch-pr.js index a0fff5a062..0d7173dfb4 100644 --- a/scripts/releasing/create-patch-pr.js +++ b/scripts/releasing/create-patch-pr.js @@ -95,17 +95,7 @@ async function main() { console.log( `Release branch ${releaseBranch} does not exist. Creating it from tag ${latestTag}...`, ); - // Workaround for workflow permission issues: create branch from HEAD then reset to tag - run(`git checkout -b ${releaseBranch}`, dryRun); - run(`git reset --hard ${latestTag}`, dryRun); - - // Ensure we're using GITHUB_TOKEN (with actions:write) for pushing workflow files - const githubToken = process.env.GITHUB_TOKEN; - const repo = process.env.GITHUB_REPOSITORY || 'google-gemini/gemini-cli'; - if (githubToken) { - run(`git remote set-url origin https://x-access-token:${githubToken}@github.com/${repo}.git`, dryRun); - } - + run(`git checkout -b ${releaseBranch} ${latestTag}`, dryRun); run(`git push origin ${releaseBranch}`, dryRun); } else { console.log(`Release branch ${releaseBranch} already exists.`);