Merge pull request #1555 from embroider-build/fix-release

Fix release script
embroider-build · Jul 21, 2023 · b8ac17b · b8ac17b
2 parents 65cfb16 + 3ad772d
commit b8ac17b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/test-packages/release/src/cli.ts b/test-packages/release/src/cli.ts
@@ -32,6 +32,10 @@ yargs(process.argv.slice(2))
           description:
             'Allows you to run "publish" even if there are uncommitted changes in your repo. Useful only for developing "publish" itself.',
         })
+        .option('otp', {
+          type: 'string',
+          description: 'This is an OTP that will be passed to npm publish',
+        })
         .option('dryRun', {
           type: 'boolean',
           description: 'Run through the release, but log to stdout instead of tagging/pushing/publishing',

diff --git a/test-packages/release/src/publish.ts b/test-packages/release/src/publish.ts
@@ -53,7 +53,7 @@ async function makeTags(solution: Solution, reporter: IssueReporter, dryRun: boo
 
       if (dryRun) {
         info(`--dryRun active. Skipping \`git tag ${tag}\``);
-        return;
+        continue;
       }
 
       await execa('git', ['tag', tag], {
@@ -101,7 +101,10 @@ async function doesReleaseExist(octokit: Octokit, tagName: string, reporter: Iss
 
     return response.status === 200;
   } catch (err) {
-    console.error(err);
+    if (err.status === 404) {
+      return false;
+    }
+    console.error(err.message);
     reporter.reportFailure(`Problem while checking for existing GitHub release`);
   }
 }
@@ -138,23 +141,27 @@ async function createGithubRelease(
   }
 }
 
-async function doesVersionExist(pkgName: string, version: string) {
+async function doesVersionExist(pkgName: string, version: string, reporter: IssueReporter) {
   try {
     let latest = await latestVersion(pkgName, { version });
     return Boolean(latest);
   } catch (err) {
-    console.info(err);
-    return false;
+    if (err.name === 'VersionNotFoundError') {
+      return false;
+    }
+
+    console.error(err.message);
+    reporter.reportFailure(`Problem while checking for existing npm release`);
   }
 }
 
-async function pnpmPublish(solution: Solution, reporter: IssueReporter, dryRun: boolean): Promise<void> {
+async function pnpmPublish(solution: Solution, reporter: IssueReporter, dryRun: boolean, otp?: string): Promise<void> {
   for (let [pkgName, entry] of solution) {
     if (!entry.impact) {
       continue;
     }
 
-    let preExisting = await doesVersionExist(pkgName, entry.newVersion);
+    let preExisting = await doesVersionExist(pkgName, entry.newVersion, reporter);
 
     if (preExisting) {
       info(`${pkgName} has already been publish @ version ${entry.newVersion}`);
@@ -163,12 +170,20 @@ async function pnpmPublish(solution: Solution, reporter: IssueReporter, dryRun:
 
     if (dryRun) {
       info(
-        `--dryRun active. Skipping \`pnpm publish --access=public\` for ${pkgName}, which would publish version ${entry.newVersion}`
+        `--dryRun active. Skipping \`pnpm publish --access=public${
+          otp ? ' --otp=*redacted*' : ''
+        }\` for ${pkgName}, which would publish version ${entry.newVersion}`
       );
-      return;
+      continue;
     }
 
     try {
+      const args = ['publish', '--access=public'];
+
+      if (otp) {
+        args.push(`--otp=${otp}`);
+      }
+
       await execa('pnpm', ['publish', '--access=public'], {
         cwd: absoluteDirname(entry.pkgJSONPath),
         stderr: 'inherit',
@@ -180,7 +195,7 @@ async function pnpmPublish(solution: Solution, reporter: IssueReporter, dryRun:
   }
 }
 
-export async function publish(opts: { skipRepoSafetyCheck?: boolean; dryRun?: boolean }) {
+export async function publish(opts: { skipRepoSafetyCheck?: boolean; dryRun?: boolean; otp?: string }) {
   let dryRun = opts.dryRun ?? false;
 
   if (!opts.skipRepoSafetyCheck) {
@@ -209,7 +224,7 @@ To publish a release you should start from a clean repo. Run "embroider-release
   let reporter = new IssueReporter();
 
   await makeTags(solution, reporter, dryRun);
-  await pnpmPublish(solution, reporter, dryRun);
+  await pnpmPublish(solution, reporter, dryRun, opts.otp);
   await pushTags(reporter, dryRun);
   await createGithubRelease(octokit, description, representativeTag, reporter, dryRun);