From 56724da0b702974aaeae92d9f8b33f373be2bccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?fn=20=E2=8C=83=20=E2=8C=A5?=
 <70830482+FnControlOption@users.noreply.github.com>
Date: Fri, 19 Nov 2021 12:30:28 -0800
Subject: [PATCH 1/2] tap-new: add `--github-packages` switch

---
 Library/Homebrew/dev-cmd/tap-new.rb | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/tap-new.rb b/Library/Homebrew/dev-cmd/tap-new.rb
index d85663aeb6..047ba2487b 100644
--- a/Library/Homebrew/dev-cmd/tap-new.rb
+++ b/Library/Homebrew/dev-cmd/tap-new.rb
@@ -24,6 +24,8 @@ module Homebrew
       flag   "--branch=",
              description: "Initialize Git repository and setup GitHub Actions workflows with the " \
                           "specified branch name (default: `main`)."
+      switch "--github-packages",
+             description: "Upload bottles to GitHub Packages."
 
       named_args :tap, number: 1
     end
@@ -43,6 +45,17 @@ module Homebrew
     titleized_user[0] = titleized_user[0].upcase
     titleized_repo[0] = titleized_repo[0].upcase
 
+    pr_pull_env = {}
+    pr_pull_env["HOMEBREW_GITHUB_API_TOKEN"] = "${{ github.token }}"
+    pr_pull_env["PULL_REQUEST"] = "${{ github.event.pull_request.number }}"
+
+    if args.github_packages?
+      pr_pull_env["HOMEBREW_GITHUB_PACKAGES_USER"] = "${{ github.actor }}"
+      pr_pull_env["HOMEBREW_GITHUB_PACKAGES_TOKEN"] = "${{ github.token }}"
+
+      root_url = GitHubPackages.root_url(tap.user, "homebrew-#{tap.repo}")
+    end
+
     (tap.path/"Formula").mkpath
 
     readme = <<~MARKDOWN
@@ -96,7 +109,7 @@ module Homebrew
 
             - run: brew test-bot --only-tap-syntax
 
-            - run: brew test-bot --only-formulae
+            - run: brew test-bot --only-formulae#{" --root-url=#{root_url}" if root_url}
               if: github.event_name == 'pull_request'
 
             - name: Upload bottles as artifact
@@ -126,8 +139,7 @@ module Homebrew
 
             - name: Pull bottles
               env:
-                HOMEBREW_GITHUB_API_TOKEN: ${{ github.token }}
-                PULL_REQUEST: ${{ github.event.pull_request.number }}
+                #{pr_pull_env.map { |k, v| "#{k}: #{v}" }.join "\n#{" " * 10}"}
               run: brew pr-pull --debug --tap=$GITHUB_REPOSITORY $PULL_REQUEST
 
             - name: Push commits

From 5657e109afb8a0c2a9cfaadf6b7aa2a872c5f7f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?fn=20=E2=8C=83=20=E2=8C=A5?=
 <70830482+FnControlOption@users.noreply.github.com>
Date: Mon, 22 Nov 2021 10:06:43 -0800
Subject: [PATCH 2/2] Apply suggestions from code review

---
 Library/Homebrew/dev-cmd/tap-new.rb | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/tap-new.rb b/Library/Homebrew/dev-cmd/tap-new.rb
index 047ba2487b..f09775fd0b 100644
--- a/Library/Homebrew/dev-cmd/tap-new.rb
+++ b/Library/Homebrew/dev-cmd/tap-new.rb
@@ -44,17 +44,7 @@ module Homebrew
     titleized_repo = tap.repo.dup
     titleized_user[0] = titleized_user[0].upcase
     titleized_repo[0] = titleized_repo[0].upcase
-
-    pr_pull_env = {}
-    pr_pull_env["HOMEBREW_GITHUB_API_TOKEN"] = "${{ github.token }}"
-    pr_pull_env["PULL_REQUEST"] = "${{ github.event.pull_request.number }}"
-
-    if args.github_packages?
-      pr_pull_env["HOMEBREW_GITHUB_PACKAGES_USER"] = "${{ github.actor }}"
-      pr_pull_env["HOMEBREW_GITHUB_PACKAGES_TOKEN"] = "${{ github.token }}"
-
-      root_url = GitHubPackages.root_url(tap.user, "homebrew-#{tap.repo}")
-    end
+    root_url = GitHubPackages.root_url(tap.user, "homebrew-#{tap.repo}") if args.github_packages?
 
     (tap.path/"Formula").mkpath
 
@@ -139,7 +129,10 @@ module Homebrew
 
             - name: Pull bottles
               env:
-                #{pr_pull_env.map { |k, v| "#{k}: #{v}" }.join "\n#{" " * 10}"}
+                HOMEBREW_GITHUB_API_TOKEN: ${{ github.token }}
+                HOMEBREW_GITHUB_PACKAGES_TOKEN: ${{ github.token }}
+                HOMEBREW_GITHUB_PACKAGES_USER: ${{ github.actor }}
+                PULL_REQUEST: ${{ github.event.pull_request.number }}
               run: brew pr-pull --debug --tap=$GITHUB_REPOSITORY $PULL_REQUEST
 
             - name: Push commits