chore: enable fork for new-library and owlbot scripts (googleapis#22393)

dazuma · web-flow · commit 61ebc237ce10 · 2023-06-13T17:42:06.000-07:00
diff --git a/.github/workflows/new-library.yml b/.github/workflows/new-library.yml
@@ -17,15 +17,15 @@ jobs:
     steps:
     - name: Checkout repo
       uses: actions/checkout@v3
-    - name: Install Ruby 3.1
+    - name: Install Ruby 3.2
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.1"
+        ruby-version: "3.2"
     - name: Install tools
       run: |
         git config --global user.email "70984784+yoshi-code-bot@users.noreply.github.com"
         git config --global user.name "Yoshi Code Bot"
         gem install --no-document toys
     - name: Create library
       run: |
-        toys new-library -v --pull --test --remote=origin --bootstrap-releases ${{ github.event.inputs.protoPath }}
+        toys new-library -v --pull --test --fork --bootstrap-releases ${{ github.event.inputs.protoPath }}
diff --git a/.github/workflows/obsolete-library.yml b/.github/workflows/obsolete-library.yml
@@ -25,8 +25,9 @@ jobs:
         ruby-version: "3.2"
     - name: Install tools
       run: |
+        git config --global user.email "70984784+yoshi-code-bot@users.noreply.github.com"
+        git config --global user.name "Yoshi Code Bot"
         gem install --no-document toys
     - name: Obsolete-library
       run: |
-        ruby -e 'require "digest"; puts Digest::MD5.hexdigest ENV["GITHUB_TOKEN"]'
         toys obsolete-library -v --fork ${{ github.event.inputs.flags }} ${{ github.event.inputs.gem }}
diff --git a/.github/workflows/owlbot.yml b/.github/workflows/owlbot.yml
@@ -20,15 +20,15 @@ jobs:
     steps:
     - name: Checkout repo
       uses: actions/checkout@v3
-    - name: Install Ruby 3.0
+    - name: Install Ruby 3.2
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.0"
+        ruby-version: "3.2"
     - name: Install tools
       run: |
         git config --global user.email "70984784+yoshi-code-bot@users.noreply.github.com"
         git config --global user.name "Yoshi Code Bot"
         gem install --no-document toys
     - name: OwlBot
       run: |
-        toys owlbot -v --pull --remote=origin ${{ github.event.inputs.flags }} ${{ github.event.inputs.gems }}
+        toys owlbot -v --pull --fork ${{ github.event.inputs.flags }} ${{ github.event.inputs.gems }}
diff --git a/.toys/new-library.rb b/.toys/new-library.rb
@@ -43,6 +43,9 @@
 flag :git_remote, "--remote NAME" do
   desc "The name of the git remote to use as the pull request head. If omitted, does not open a pull request."
 end
+flag :enable_fork, "--fork" do
+  desc "Use a fork to open the pull request"
+end
 flag :enable_tests, "--[no-]test" do
   desc "Run CI on the newly-created library"
 end
@@ -81,6 +84,10 @@ def setup
   Dir.chdir context_directory
   error "#{owlbot_config_path} already exists" if File.file? owlbot_config_path
   yoshi_utils.git_ensure_identity
+  if enable_fork
+    set :git_remote, "pull-request-fork" unless git_remote
+    yoshi_utils.gh_ensure_fork remote: git_remote
+  end
   mkdir_p gem_name
 end
 
diff --git a/.toys/owlbot.rb b/.toys/owlbot.rb
@@ -30,6 +30,9 @@
 flag :git_remote, "--remote=NAME" do
   desc "The name of the git remote to use as the pull request head. If omitted, does not open a pull request."
 end
+flag :enable_fork, "--fork" do
+  desc "Use a fork to open the pull request"
+end
 flag :commit_message, "--message=MESSAGE" do
   desc "The conventional commit message"
 end
@@ -76,7 +79,7 @@ def run
 
   gems = choose_gems
   cd context_directory
-  yoshi_utils.git_ensure_identity
+  setup_git
   gem_info = collect_gem_info gems
 
   pull_images
@@ -91,6 +94,14 @@ def run
   final_output results
 end
 
+def setup_git
+  yoshi_utils.git_ensure_identity
+  if enable_fork
+    set :git_remote, "pull-request-fork" unless git_remote
+    yoshi_utils.gh_ensure_fork remote: git_remote
+  end
+end
+
 def ensure_docker
   result = exec ["docker", "--version"], out: :capture, e: false
   error "Docker not installed" unless result.success?
