Merge remote-tracking branch 'origin/main' into 1.33-releases

Author: gribnoysup

package-lock.json

@@ -27,7 +27,7 @@
     "node-rebuild": "node ./scripts/rebuild.js kerberos keytar interruptor",
     "packages-publish": "lerna publish from-package --allow-branch main",
     "postpackages-publish": "git push && git push --tags",
-    "packages-version": "lerna version --allow-branch main --no-push --no-private -m \"chore(release): Bump package versions\"",
+    "packages-version": "lerna version --allow-branch main --no-push --no-private -m \"chore(release): bump package versions\"",
     "release": "npm run release --workspace mongodb-compass --",
     "reformat": "lerna run reformat --stream --no-bail",
     "reformat-changed": "lerna run reformat --stream --no-bail --since origin/HEAD --exclude-dependents",

package.json

@@ -197,27 +197,14 @@ async function publishGitHubRelease(assets, version, channel, dryRun) {
     })
   );
 
-  const uploads = assetsToUpload.map(async(asset) => {
-    cli.info(
-      `${
-        asset.name
-      }: upload to Github release ${releaseTag} started (path: ${path.relative(
-        root,
-        asset.path
-      )}).`
-    );
-    if (!dryRun) {
-      await repo.uploadReleaseAsset(releaseTag, {
-        name: asset.name,
-        path: asset.path
-      });
-    }
-    cli.info(
-      `${asset.name}: upload to Github release ${releaseTag} completed.`
-    );
+  cli.info(`Uploading ${assetsToUpload.length} asset(s) to GitHub release:`);
+  assetsToUpload.forEach((asset) => {
+    cli.info(` - ${path.relative(root, asset.path)}`);
   });
-
-  await Promise.all(uploads);
+  if (!dryRun) {
+    await repo.uploadReleaseAsset(releaseTag, assetsToUpload);
+  }
+  cli.info('Asset upload complete');
 }
 
 async function uploadAssetsToDownloadCenter(assets, channel, dryRun) {

packages/hadron-build/commands/upload.js

@@ -19,7 +19,7 @@
     "url": "https://github.com/mongodb-js/compass.git"
   },
   "dependencies": {
-    "@mongodb-js/devtools-github-repo": "^1.1.0",
+    "@mongodb-js/devtools-github-repo": "^1.2.0",
     "@mongodb-js/dl-center": "^1.0.1",
     "@mongodb-js/electron-wix-msi": "^3.0.0",
     "@mongodb-js/mongodb-notary-service-client": "^1.8.0",