zotero-plugin 4.0.2 → 4.0.3

package/bin/release.js

@@ -8137,7 +8137,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
     "package.json"(exports, module) {
       module.exports = {
         name: "zotero-plugin",
-        version: "4.0.2",
+        version: "4.0.3",
         description: "Zotero plugin builder",
         homepage: "https://github.com/retorquere/zotero-plugin/wiki",
         bin: {
@@ -11509,8 +11509,12 @@ Expecting one of '${allowedValues.join("', '")}'`);
   process.on("unhandledRejection", (up) => {
     throw up;
   });
-  program.version(require_package2().version).option("-r, --release-message <value>", "add message to github release").option("-x, --xpi <value>", "xpi filename template", "{name}-{version}.xpi").option("-d, --dry-run", "dry run", !ContinuousIntegration.service).option("-p, --pre-release", "release is a pre-release").parse(process.argv);
+  program.version(require_package2().version).option("-r, --release-message <value>", "add message to github release").option("-x, --xpi <value>", "xpi filename template", "{name}-{version}.xpi").option("-d, --dry-run", "dry run", !ContinuousIntegration.service).option("-p, --pre-release", "release is a pre-release").option("-t, --tag", "tag for release", ContinuousIntegration.tag).parse(process.argv);
   var options = program.opts();
+  if (options.tag && options.tag !== ContinuousIntegration.tag) {
+    console.log("dry-run: tag specified manually, switching to dry-run mode");
+    options.dryRun = true;
+  }
   if (options.releaseMessage?.startsWith("@")) options.releaseMessage = fs2.readFileSync(options.releaseMessage.substring(1), "utf-8");
   var octokit = new Octokit2({ auth: `token ${process.env.GITHUB_TOKEN}` });
   var pkg = __require(path2.join(root_default, "package.json"));
@@ -11529,10 +11533,10 @@ Expecting one of '${allowedValues.join("', '")}'`);
     console.log(`${options.dryRun ? "dry-run: " : ""}${msg}`);
   }
   if (ContinuousIntegration.pull_request) bail("Not releasing pull requests", 0);
-  if (ContinuousIntegration.tag) {
-    if (`v${pkg.version}` !== ContinuousIntegration.tag) bail(`Building tag ${ContinuousIntegration.tag}, but package version is ${pkg.version}`);
+  if (options.tag) {
+    if (`v${pkg.version}` !== options.tag) bail(`Building tag ${options.tag}, but package version is ${pkg.version}`);
     const releaseBranches = ["main", "master"].concat(pkg.xpi.releaseBranches || []);
-    if (ContinuousIntegration.branch && !releaseBranches.includes(ContinuousIntegration.branch)) bail(`Building tag ${ContinuousIntegration.tag}, but branch is ${ContinuousIntegration.branch}`);
+    if (ContinuousIntegration.branch && !releaseBranches.includes(ContinuousIntegration.branch)) bail(`Building tag ${options.tag}, but branch is ${ContinuousIntegration.branch}`);
   }
   var tags = /* @__PURE__ */ new Set();
   for (let regex = /(?:^|\s)(?:#)([a-zA-Z\d]+)/gm, tag; tag = regex.exec(ContinuousIntegration.commit_message); ) {
@@ -11547,13 +11551,13 @@ Expecting one of '${allowedValues.join("', '")}'`);
     if (tags.has("noannounce")) return;
     let build;
     let reason = "";
-    if (ContinuousIntegration.tag) {
+    if (options.tag) {
       build = `${options.preRelease ? "pre-" : ""}release ${ContinuousIntegration.tag}`;
     } else {
       build = `test build ${version_default}`;
     }
     const link = `[${build}](https://github.com/${owner}/${repo}/releases/download/${release.data.tag_name}/${pkg.name}-${version_default}.xpi)`;
-    if (!ContinuousIntegration.tag) {
+    if (!options.tag) {
       reason = ` (${JSON.stringify(ContinuousIntegration.commit_message)})`;
       reason += `
 
@@ -11568,7 +11572,7 @@ This update may name other issues, but the build just dropped here is for you; i
       await octokit.issues.createComment({ owner, repo, issue_number, body });
       if (locked) await octokit.issues.lock({ owner, repo, issue_number });
     } catch (error) {
-      console.log(`Failed to announce '${build}: ${reason}' on ${issue_number}`);
+      report(`Failed to announce '${build}: ${reason}' on ${issue_number}`);
     }
     if (process.env.GITHUB_ENV) fs2.appendFileSync(process.env.GITHUB_ENV, `XPI_RELEASED=${issue_number}
 `);
@@ -11625,7 +11629,11 @@ This update may name other issues, but the build just dropped here is for you; i
     for (const asset of assets) {
       if (asset.name in updates && updates[asset.name]) {
         report(`removing ${asset.name} from ${release.data.tag_name}`);
-        if (!options.dryRun) await octokit.repos.deleteReleaseAsset({ owner, repo, asset_id: asset.id });
+        if (options.dryRun) {
+          report(`update ${asset.name}`);
+        } else {
+          await octokit.repos.deleteReleaseAsset({ owner, repo, asset_id: asset.id });
+        }
       }
     }
     for (const [pointer, mimetype] of Object.entries(updates)) {
@@ -11640,14 +11648,17 @@ This update may name other issues, but the build just dropped here is for you; i
       }
     }
     let release;
-    if (ContinuousIntegration.tag) {
+    if (options.tag) {
       try {
-        await octokit.repos.getReleaseByTag({ owner, repo, tag: ContinuousIntegration.tag });
-        bail(`release ${ContinuousIntegration.tag} exists, bailing`);
+        await octokit.repos.getReleaseByTag({ owner, repo, tag: options.tag });
+        if (!options.dryRun) bail(`release ${options.tag} exists, bailing`);
       } catch (err) {
       }
-      report(`uploading ${xpi} to new release ${ContinuousIntegration.tag}`);
-      if (!options.dryRun) {
+      if (options.dryRun) {
+        report(`create release ${options.tag}`);
+        report(`upload asset ${xpi}`);
+      } else {
+        report(`uploading ${xpi} to new release ${ContinuousIntegration.tag}`);
         release = await octokit.repos.createRelease({ owner, repo, tag_name: ContinuousIntegration.tag, prerelease: !!options.preRelease, body: options.releaseMessage || "" });
         await uploadAsset(release, path2.join(root_default, `xpi/${xpi}`), "application/vnd.zotero.plugin");
       }
@@ -11657,7 +11668,11 @@ This update may name other issues, but the build just dropped here is for you; i
       for (const asset of release.data.assets || []) {
         if (asset.name.endsWith(".xpi") && asset.created_at < EXPIRE_BUILDS) {
           report(`deleting ${asset.name}`);
-          if (!options.dryRun) await octokit.repos.deleteReleaseAsset({ owner, repo, asset_id: asset.id });
+          if (options.dryRun) {
+            report(`delete asset ${asset.name}`);
+          } else {
+            await octokit.repos.deleteReleaseAsset({ owner, repo, asset_id: asset.id });
+          }
         }
       }
       await uploadAsset(release, path2.join(root_default, `xpi/${xpi}`), "application/vnd.zotero.plugin");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zotero-plugin",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "Zotero plugin builder",
   "homepage": "https://github.com/retorquere/zotero-plugin/wiki",
   "bin": {