chore: Stop attempting to automerge bump-version PRs (#28940)

googleapis · Feb 6, 2025 · 57e80b9 · 57e80b9
1 parent 2dc82dc
commit 57e80b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
@@ -18,7 +18,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: ${{ secrets.YOSHI_CODE_BOT_TOKEN }}
-      APPROVAL_GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4

diff --git a/.toys/bump-version.rb b/.toys/bump-version.rb
@@ -26,6 +26,9 @@
 flag :enable_fork, "--fork" do
   desc "Use a fork to open the pull request"
 end
+flag :automerge do
+  desc "Automatically merge the pull request"
+end
 flag :approval_token, "--approval-token" do
   default ENV["APPROVAL_GITHUB_TOKEN"]
   desc "GitHub token for adding labels to pull requests"
@@ -51,7 +54,7 @@ def run
   setup
   verify_version
   pr_number = open_change_pr
-  process_change_pr pr_number if git_remote
+  process_change_pr pr_number if git_remote && automerge
 end
 
 def setup