use tag-based workflow for merging

Author: gagik

.github/workflows/merge-release-pr.yml

@@ -0,0 +1,35 @@
+name: Merge mongosh Release PR
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  prepare-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mongodb-js/devtools-shared/actions/setup-bot-token@main
+        id: app-token
+        with:
+          app-id: ${{ vars.DEVTOOLS_BOT_APP_ID }}
+          private-key: ${{ secrets.DEVTOOLS_BOT_PRIVATE_KEY }}
+      
+      - uses: actions/checkout@v4
+        with:
+          # don't checkout a detatched HEAD
+          ref: ${{ github.head_ref }}
+
+          # this is important so git log can pick up on
+          # the whole history to generate the list of AUTHORS
+          fetch-depth: "0"
+          token: ${{ steps.app-token.outputs.token }}
+
+
+      - name: Merge Pull Request
+        shell: bash
+        env:
+          MONGOSH_RELEASE_VERSION: ${{ env.NEXT_VERSION }}
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: |
+           gh pr merge release/${{ github.ref_name }} --squash

.github/workflows/prepare-release-mongosh.yml

@@ -104,7 +104,7 @@ jobs:
         with:
           token: ${{ steps.app-token.outputs.token }}
           commit-message: "chore(release): prepare for mongosh v${NEXT_VERSION} ${{ github.event.inputs.jiraTicket }}"
-          branch: release/${NEXT_VERSION}
+          branch: release/${RELEASE_TAG}
           title: "chore(release): prepare for mongosh v${NEXT_VERSION} ${{ github.event.inputs.jiraTicket }}"
           body: |
             - [${{ github.event.inputs.jiraTicket }}](https://jira.mongodb.org/browse/${{ github.event.inputs.jiraTicket }})

packages/build/src/npm-packages/publish.ts

@@ -24,10 +24,12 @@ export function publishToNpm(
   spawnSync: typeof spawnSyncFn = spawnSyncFn
 ): Promise<void> {
   const publisher = process.env.MONGOSH_RELEASE_PUBLISHER;
-  if (!publisher && !useAuxiliaryPackagesOnly) {
-    throw new Error(
-      'MONGOSH_RELEASE_PUBLISHER not specified for publishing mongosh release'
-    );
+  if (!useAuxiliaryPackagesOnly) {
+    if (!publisher) {
+      throw new Error(
+        'MONGOSH_RELEASE_PUBLISHER is required for publishing mongosh'
+      );
+    }
   }
 
   const commandOptions: SpawnSyncOptionsWithStringEncoding = {
@@ -49,7 +51,9 @@ export function publishToNpm(
       (packageConfig) => !MONGOSH_RELEASE_PACKAGES.includes(packageConfig.name)
     );
   }
-  await setReleasePublisher(publisher, packages);
+  if (publisher) {
+    await setReleasePublisher(publisher, packages);
+  }
   // Lerna requires a clean repository for a publish from-package
   // we use git update-index --assume-unchanged on files we know have been bumped
   markBumpedFilesAsAssumeUnchangedFn(packages, true);
@@ -82,32 +86,11 @@ export function publishToNpm(
 
     spawnSync(
       'git',
-      ['tag', '-a', mongoshVersion, '-m', mongoshVersion],
+      ['tag', '-a', `v${mongoshVersion}`, '-m', `v${mongoshVersion}`],
       commandOptions
     );
 
     spawnSync('git', ['push', '--follow-tags'], commandOptions);
-
-    // Merge the release branch into main
-    spawnSync('git', ['checkout', 'origin/main'], commandOptions);
-    spawnSync(
-      'git',
-      ['merge', '--squash', `origin/release/${mongoshVersion}`],
-      commandOptions
-    );
-    spawnSync(
-      'git',
-      ['commit', '-m', `chore(release): release mongosh v${mongoshVersion}`],
-      commandOptions
-    );
-    spawnSync('git', ['push', 'origin', 'main'], commandOptions);
-
-    // Delete the release branch after merging
-    spawnSync(
-      'git',
-      ['branch', '-D', `release/${mongoshVersion}`],
-      commandOptions
-    );
   }
 }