fix(ci): commit changes from bumping packages

Author: gagik

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

@@ -7,6 +7,7 @@ import {
 
 import { promises as fs } from 'fs';
 import path from 'path';
+import { spawnSync as spawnSyncFn } from '../helpers';
 import { getPackagesInTopologicalOrder } from '@mongodb-js/monorepo-tools';
 
 /** Bumps only the main mongosh release packages to the set version. */
@@ -106,7 +107,9 @@ export function bumpAuxiliaryPackages() {
   });
 }
 
-export function commitBumpedPackages() {
+export function commitBumpedPackages(
+  spawnSync: typeof spawnSyncFn = spawnSyncFn
+) {
   spawnSync('git', ['add', '.'], {
     stdio: 'inherit',
     cwd: PROJECT_ROOT,

packages/build/src/publish-auxiliary.ts

@@ -7,6 +7,10 @@ export function publishAuxiliaryPackages(config: Config) {
       'This should only be used when publishing auxiliary packages'
     );
   }
+  pushTags({
+    useAuxiliaryPackagesOnly: true,
+    isDryRun: config.isDryRun || false,
+  });
   publishToNpm(config);
   pushTags({
     useAuxiliaryPackagesOnly: true,

packages/build/src/publish-mongosh.spec.ts

@@ -49,6 +49,7 @@ describe('publishMongosh', function () {
   let barque: Barque;
   let pushTags: typeof pushTagsType;
   const getEvergreenArtifactUrl = getArtifactUrl;
+  let spawnSync: sinon.SinonStub;
 
   beforeEach(function () {
     config = { ...dummyConfig };
@@ -61,6 +62,7 @@ describe('publishMongosh', function () {
     pushTags = sinon.spy();
     bumpMongoshReleasePackages = sinon.spy();
     bumpAuxiliaryPackages = sinon.spy();
+    spawnSync = sinon.stub().resolves();
 
     githubRepo = createStubRepo();
     mongoHomebrewCoreForkRepo = createStubRepo();
@@ -108,7 +110,8 @@ describe('publishMongosh', function () {
             shouldDoPublicRelease,
             getEvergreenArtifactUrl,
             bumpMongoshReleasePackages,
-            bumpAuxiliaryPackages
+            bumpAuxiliaryPackages,
+            spawnSync
           );
         } catch (e: any) {
           return expect(e.message).to.contain('Could not find prior draft tag');
@@ -137,7 +140,8 @@ describe('publishMongosh', function () {
             shouldDoPublicRelease,
             getEvergreenArtifactUrl,
             bumpMongoshReleasePackages,
-            bumpAuxiliaryPackages
+            bumpAuxiliaryPackages,
+            spawnSync
           );
         } catch (e: any) {
           return expect(e.message).to.contain('Version mismatch');
@@ -161,7 +165,8 @@ describe('publishMongosh', function () {
         shouldDoPublicRelease,
         getEvergreenArtifactUrl,
         bumpMongoshReleasePackages,
-        bumpAuxiliaryPackages
+        bumpAuxiliaryPackages,
+        spawnSync
       );
 
       expect(barque.releaseToBarque).to.have.been.callCount(26);
@@ -195,7 +200,8 @@ describe('publishMongosh', function () {
         shouldDoPublicRelease,
         getEvergreenArtifactUrl,
         bumpMongoshReleasePackages,
-        bumpAuxiliaryPackages
+        bumpAuxiliaryPackages,
+        spawnSync
       );
 
       expect(createAndPublishDownloadCenterConfig).to.have.been.calledWith(
@@ -221,7 +227,8 @@ describe('publishMongosh', function () {
         shouldDoPublicRelease,
         getEvergreenArtifactUrl,
         bumpMongoshReleasePackages,
-        bumpAuxiliaryPackages
+        bumpAuxiliaryPackages,
+        spawnSync
       );
 
       expect(githubRepo.promoteRelease).to.have.been.calledWith(config);
@@ -242,7 +249,8 @@ describe('publishMongosh', function () {
         shouldDoPublicRelease,
         getEvergreenArtifactUrl,
         bumpMongoshReleasePackages,
-        bumpAuxiliaryPackages
+        bumpAuxiliaryPackages,
+        spawnSync
       );
 
       expect(writeBuildInfo).to.have.been.calledOnceWith(config);
@@ -264,7 +272,8 @@ describe('publishMongosh', function () {
         shouldDoPublicRelease,
         getEvergreenArtifactUrl,
         bumpMongoshReleasePackages,
-        bumpAuxiliaryPackages
+        bumpAuxiliaryPackages,
+        spawnSync
       );
 
       expect(publishToHomebrew).to.have.been.calledWith(
@@ -298,7 +307,8 @@ describe('publishMongosh', function () {
         shouldDoPublicRelease,
         getEvergreenArtifactUrl,
         bumpMongoshReleasePackages,
-        bumpAuxiliaryPackages
+        bumpAuxiliaryPackages,
+        spawnSync
       );
 
       expect(createAndPublishDownloadCenterConfig).not.to.have.been.called;
@@ -319,7 +329,8 @@ describe('publishMongosh', function () {
         shouldDoPublicRelease,
         getEvergreenArtifactUrl,
         bumpMongoshReleasePackages,
-        bumpAuxiliaryPackages
+        bumpAuxiliaryPackages,
+        spawnSync
       );
 
       expect(githubRepo.promoteRelease).not.to.have.been.called;
@@ -340,7 +351,8 @@ describe('publishMongosh', function () {
         shouldDoPublicRelease,
         getEvergreenArtifactUrl,
         bumpMongoshReleasePackages,
-        bumpAuxiliaryPackages
+        bumpAuxiliaryPackages,
+        spawnSync
       );
 
       expect(publishToNpm).not.to.have.been.called;
@@ -361,7 +373,8 @@ describe('publishMongosh', function () {
         shouldDoPublicRelease,
         getEvergreenArtifactUrl,
         bumpMongoshReleasePackages,
-        bumpAuxiliaryPackages
+        bumpAuxiliaryPackages,
+        spawnSync
       );
 
       expect(publishToHomebrew).not.to.have.been.called;
@@ -382,7 +395,8 @@ describe('publishMongosh', function () {
         shouldDoPublicRelease,
         getEvergreenArtifactUrl,
         bumpMongoshReleasePackages,
-        bumpAuxiliaryPackages
+        bumpAuxiliaryPackages,
+        spawnSync
       );
 
       expect(barque.releaseToBarque).not.to.have.been.called;

packages/build/src/publish-mongosh.ts

@@ -19,6 +19,7 @@ import {
   bumpAuxiliaryPackages as bumpAuxiliaryPackagesFn,
 } from './npm-packages';
 import { commitBumpedPackages } from './npm-packages/bump';
+import { spawnSync as spawnSyncFn } from './helpers';
 
 export async function publishMongosh(
   config: Config,
@@ -34,7 +35,8 @@ export async function publishMongosh(
   shouldDoPublicRelease: typeof shouldDoPublicReleaseFn = shouldDoPublicReleaseFn,
   getEvergreenArtifactUrl: typeof getArtifactUrlFn = getArtifactUrlFn,
   bumpMongoshReleasePackages: typeof bumpMongoshReleasePackagesFn = bumpMongoshReleasePackagesFn,
-  bumpAuxiliaryPackages: typeof bumpAuxiliaryPackagesFn = bumpAuxiliaryPackagesFn
+  bumpAuxiliaryPackages: typeof bumpAuxiliaryPackagesFn = bumpAuxiliaryPackagesFn,
+  spawnSync: typeof spawnSyncFn = spawnSyncFn
 ): Promise<void> {
   if (!shouldDoPublicRelease(config)) {
     console.warn(
@@ -68,7 +70,11 @@ export async function publishMongosh(
 
   bumpAuxiliaryPackages();
   await bumpMongoshReleasePackages(releaseVersion);
-  commitBumpedPackages();
+  commitBumpedPackages(spawnSync);
+  pushTags({
+    useAuxiliaryPackagesOnly: false,
+    isDryRun: config.isDryRun || false,
+  });
 
   await publishArtifactsToBarque(
     barque,
@@ -106,11 +112,6 @@ export async function publishMongosh(
     !!config.isDryRun
   );
 
-  pushTags({
-    useAuxiliaryPackagesOnly: false,
-    isDryRun: config.isDryRun || false,
-  });
-
   console.info('mongosh: finished release process.');
 }