fix(ci): commit changes from bumping packages (#2352)

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. */
@@ -105,3 +106,19 @@ export function bumpAuxiliaryPackages() {
     },
   });
 }
+
+export function commitBumpedPackages(
+  spawnSync: typeof spawnSyncFn = spawnSyncFn
+) {
+  spawnSync('git', ['add', '.'], {
+    stdio: 'inherit',
+    cwd: PROJECT_ROOT,
+    encoding: 'utf8',
+  });
+
+  spawnSync('git', ['commit', '-m', 'chore(release): bump packages'], {
+    stdio: 'inherit',
+    cwd: PROJECT_ROOT,
+    encoding: 'utf8',
+  });
+}

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

@@ -6,7 +6,6 @@ import { publishToNpm } from './publish';
 
 describe('npm-packages publishToNpm', function () {
   let listNpmPackages: SinonStub;
-  let markBumpedFilesAsAssumeUnchanged: SinonStub;
   let spawnSync: SinonStub;
   const lernaBin = path.resolve(
     __dirname,
@@ -21,7 +20,6 @@ describe('npm-packages publishToNpm', function () {
 
   beforeEach(function () {
     listNpmPackages = sinon.stub();
-    markBumpedFilesAsAssumeUnchanged = sinon.stub();
     spawnSync = sinon.stub();
   });
 
@@ -32,17 +30,8 @@ describe('npm-packages publishToNpm', function () {
     ];
     listNpmPackages.returns(packages);
 
-    publishToNpm(
-      { isDryRun: false, useAuxiliaryPackagesOnly: false },
-      listNpmPackages,
-      markBumpedFilesAsAssumeUnchanged,
-      spawnSync
-    );
+    publishToNpm({ isDryRun: false }, listNpmPackages);
 
-    expect(markBumpedFilesAsAssumeUnchanged).to.have.been.calledWith(
-      packages,
-      true
-    );
     expect(spawnSync).to.have.been.calledWith(
       lernaBin,
       [
@@ -56,36 +45,5 @@ describe('npm-packages publishToNpm', function () {
       ],
       sinon.match.any
     );
-    expect(markBumpedFilesAsAssumeUnchanged).to.have.been.calledWith(
-      packages,
-      false
-    );
-  });
-
-  it('reverts the assume unchanged even on spawn failure', function () {
-    const packages = [{ name: 'packageA', version: '0.7.0' }];
-    listNpmPackages.returns(packages);
-    spawnSync.throws(new Error('meeep'));
-
-    try {
-      publishToNpm(
-        { isDryRun: false, useAuxiliaryPackagesOnly: false },
-        listNpmPackages,
-        markBumpedFilesAsAssumeUnchanged,
-        spawnSync
-      );
-    } catch (e: any) {
-      expect(markBumpedFilesAsAssumeUnchanged).to.have.been.calledWith(
-        packages,
-        true
-      );
-      expect(spawnSync).to.have.been.called;
-      expect(markBumpedFilesAsAssumeUnchanged).to.have.been.calledWith(
-        packages,
-        false
-      );
-      return;
-    }
-    expect.fail('Expected error');
   });
 });

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

@@ -1,19 +1,11 @@
 import path from 'path';
-import {
-  EXCLUDE_RELEASE_PACKAGES,
-  LERNA_BIN,
-  MONGOSH_RELEASE_PACKAGES,
-  PROJECT_ROOT,
-} from './constants';
+import { LERNA_BIN, PROJECT_ROOT } from './constants';
 import type { LernaPackageDescription } from './list';
-import { listNpmPackages as listNpmPackagesFn } from './list';
 import { spawnSync as spawnSyncFn } from '../helpers/spawn-sync';
 import type { SpawnSyncOptionsWithStringEncoding } from 'child_process';
 
 export function publishToNpm(
-  { isDryRun = false, useAuxiliaryPackagesOnly = false },
-  listNpmPackages: typeof listNpmPackagesFn = listNpmPackagesFn,
-  markBumpedFilesAsAssumeUnchangedFn: typeof markBumpedFilesAsAssumeUnchanged = markBumpedFilesAsAssumeUnchanged,
+  { isDryRun = false },
   spawnSync: typeof spawnSyncFn = spawnSyncFn
 ): void {
   const commandOptions: SpawnSyncOptionsWithStringEncoding = {
@@ -25,37 +17,22 @@ export function publishToNpm(
       ...(isDryRun ? { npm_config_dry_run: 'true' } : {}),
     },
   };
-  const allReleasablePackages = listNpmPackages().filter(
-    (packageConfig) => !EXCLUDE_RELEASE_PACKAGES.includes(packageConfig.name)
-  );
-
-  const packages: LernaPackageDescription[] = useAuxiliaryPackagesOnly
-    ? allReleasablePackages.filter(
-        (packageConfig) =>
-          !MONGOSH_RELEASE_PACKAGES.includes(packageConfig.name)
-      )
-    : allReleasablePackages;
 
   // 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);
-  try {
-    spawnSync(
-      LERNA_BIN,
-      [
-        'publish',
-        'from-package',
-        '--no-private',
-        '--no-changelog',
-        '--exact',
-        '--yes',
-        '--no-verify-access',
-      ],
-      commandOptions
-    );
-  } finally {
-    markBumpedFilesAsAssumeUnchangedFn(packages, false);
-  }
+  spawnSync(
+    LERNA_BIN,
+    [
+      'publish',
+      'from-package',
+      '--no-private',
+      '--no-changelog',
+      '--exact',
+      '--yes',
+      '--no-verify-access',
+    ],
+    commandOptions
+  );
 }
 
 export function markBumpedFilesAsAssumeUnchanged(

packages/build/src/npm-packages/push-tags.ts

@@ -72,7 +72,7 @@ export function pushTags(
   }
 
   if (!isDryRun) {
-    spawnSync('git', ['push', '--follow-tags'], commandOptions);
+    spawnSync('git', ['push', '--tags'], commandOptions);
   }
 }
 

packages/build/src/publish-auxiliary.ts

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

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

@@ -18,6 +18,8 @@ import {
   bumpMongoshReleasePackages as bumpMongoshReleasePackagesFn,
   bumpAuxiliaryPackages as bumpAuxiliaryPackagesFn,
 } from './npm-packages';
+import { commitBumpedPackages } from './npm-packages/bump';
+import { spawnSync as spawnSyncFn } from './helpers';
 
 export async function publishMongosh(
   config: Config,
@@ -33,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(
@@ -67,6 +70,11 @@ export async function publishMongosh(
 
   bumpAuxiliaryPackages();
   await bumpMongoshReleasePackages(releaseVersion);
+  commitBumpedPackages(spawnSync);
+  pushTags({
+    useAuxiliaryPackagesOnly: false,
+    isDryRun: config.isDryRun || false,
+  });
 
   await publishArtifactsToBarque(
     barque,
@@ -94,7 +102,6 @@ export async function publishMongosh(
 
   publishToNpm({
     isDryRun: config.isDryRun,
-    useAuxiliaryPackagesOnly: config.useAuxiliaryPackagesOnly,
   });
 
   await publishToHomebrew(
@@ -105,11 +112,6 @@ export async function publishMongosh(
     !!config.isDryRun
   );
 
-  pushTags({
-    useAuxiliaryPackagesOnly: false,
-    isDryRun: config.isDryRun || false,
-  });
-
   console.info('mongosh: finished release process.');
 }