From 83cb5e6fff20f3040415cc2eebc5ac71679909ad Mon Sep 17 00:00:00 2001
From: Jonathan Zempel <jzempel@gmail.com>
Date: Thu, 22 Aug 2024 15:32:04 -0400
Subject: [PATCH] fix: ensure `tag` script releases to the correct default
 branch (#1903)

---
 .github/workflows/ci.yaml | 3 ---
 utils/scripts/tag.mjs     | 9 +++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f0edfd059dc..8b87acadcbc 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -65,9 +65,6 @@ jobs:
           path: packages
 
       - run: npm run test:ci
-      - run: npm exec -- coveralls < .cache/coverage/lcov.info
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
 
   deploy-staging:
     if: >
diff --git a/utils/scripts/tag.mjs b/utils/scripts/tag.mjs
index c95e167f254..64752f8be4d 100755
--- a/utils/scripts/tag.mjs
+++ b/utils/scripts/tag.mjs
@@ -83,20 +83,21 @@ const changelog = async (tag, spinner) => {
 /**
  * Push a GitHub release.
  *
+ * @param {String} main Name for the main branch being released.
  * @param {String} tag The tag for the new release.
  * @param {String} markdown Markdown content.
  * @param {Ora} spinner Terminal spinner.
  *
  * @returns The draft release URL.
  */
-const release = async (tag, markdown, spinner) => {
+const release = async (main, tag, markdown, spinner) => {
   info('Creating release...', spinner);
 
   const pushArgs = ['push', '--follow-tags', '--no-verify', '--atomic', 'origin'];
 
   // Ensure `version` commit hits CI, triggering npm publish
-  await execa('git', pushArgs.concat('HEAD^:main'));
-  await execa('git', pushArgs.concat('main'));
+  await execa('git', pushArgs.concat(`HEAD^:${main}`));
+  await execa('git', pushArgs.concat(main));
 
   const url = await githubRelease({ tag, body: markdown, spinner });
 
@@ -221,7 +222,7 @@ program
       ]);
 
       if (prompt.release) {
-        await release(tag, markdown, spinner);
+        await release(program.opts().main, tag, markdown, spinner);
       } else {
         await rollback(tag, spinner);
       }