chore: put fork back in (googleapis#22397)

dazuma · web-flow · commit e965c06146b1 · 2023-06-13T18:48:09.000-07:00
diff --git a/.github/workflows/new-library.yml b/.github/workflows/new-library.yml
@@ -26,4 +26,4 @@ jobs:
         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
@@ -28,4 +28,4 @@ jobs:
         gem install --no-document toys
     - name: Obsolete-library
       run: |
-        toys obsolete-library -v --remote=origin ${{ github.event.inputs.flags }} ${{ github.event.inputs.gem }}
+        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
@@ -29,4 +29,4 @@ jobs:
         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/.github/workflows/release-please-bootstrap.yml b/.github/workflows/release-please-bootstrap.yml
@@ -15,12 +15,13 @@ 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: "gem install --no-document toys"
+        run: |
+          gem install --no-document toys
       - name: execute
         run: |
-          toys release bootstrap -v --remote=origin ${{ github.event.inputs.gems }}
+          toys release bootstrap -v --fork ${{ github.event.inputs.gems }}
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -19,10 +19,10 @@ 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 NodeJS 16.x
         uses: actions/setup-node@v3
         with:
diff --git a/.github/workflows/update-release-levels.yml b/.github/workflows/update-release-levels.yml
@@ -24,4 +24,4 @@ jobs:
           gem install --no-document toys
       - name: execute
         run: |
-          toys update-release-levels --remote=origin ${{ github.event.inputs.args }}
+          toys update-release-levels --fork ${{ github.event.inputs.args }}
diff --git a/.toys/release.rb b/.toys/release.rb
@@ -40,7 +40,10 @@
   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
+  
   include :exec, e: true
   include :terminal
   include "yoshi-pr-generator"
@@ -56,10 +59,11 @@ def run
     end
     puts "Adding #{packages.size} packages..."
 
+    setup_git
+
     date = Time.now.utc.strftime("%Y%m%d-%H%M%S")
     set :branch_name, "gen/bootstrap-release-#{date}" unless branch_name
     commit_message = "chore: Bootstrap release manifest for new packages"
-    yoshi_utils.git_ensure_identity
     yoshi_pr_generator.capture enabled: !git_remote.nil?,
                                remote: git_remote,
                                branch_name: branch_name,
@@ -68,6 +72,14 @@ def run
     end
   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 update_manifest_files
     config = JSON.parse File.read config_name
     manifest = JSON.parse File.read manifest_name
diff --git a/.toys/update-release-levels.rb b/.toys/update-release-levels.rb
@@ -19,6 +19,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
 
 include :exec, e: true
 include "yoshi-pr-generator"
@@ -27,6 +30,11 @@ def run
   require "json"
 
   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
+
   updated, pr_result = update_release_levels
   output_result updated, pr_result
 end
