fix(ci): commit changes from bumping packages

Author: gagik

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

@@ -105,3 +105,17 @@ export function bumpAuxiliaryPackages() {
     },
   });
 }
+
+export function commitBumpedPackages() {
+  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/publish-mongosh.ts

@@ -18,6 +18,7 @@ import {
   bumpMongoshReleasePackages as bumpMongoshReleasePackagesFn,
   bumpAuxiliaryPackages as bumpAuxiliaryPackagesFn,
 } from './npm-packages';
+import { commitBumpedPackages } from './npm-packages/bump';
 
 export async function publishMongosh(
   config: Config,
@@ -67,6 +68,7 @@ export async function publishMongosh(
 
   bumpAuxiliaryPackages();
   await bumpMongoshReleasePackages(releaseVersion);
+  commitBumpedPackages();
 
   await publishArtifactsToBarque(
     barque,
@@ -94,7 +96,6 @@ export async function publishMongosh(
 
   publishToNpm({
     isDryRun: config.isDryRun,
-    useAuxiliaryPackagesOnly: config.useAuxiliaryPackagesOnly,
   });
 
   await publishToHomebrew(