@todesktop/cli 1.7.0-0 → 1.7.0-2

package/dist/cli.js

@@ -4076,7 +4076,7 @@ var PickBuildForRelease = ({ commandUsed, shouldConfirm, configPath }) => {
     ] });
   } else {
     return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(import_ink30.Box, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(import_ink30.Text, { children: "No elligible builds found " }),
+      /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(import_ink30.Text, { children: "No eligible builds found " }),
       /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(import_ink30.Text, { dimColor: true, children: "(i.e. unreleased and successful)" })
     ] });
   }
@@ -4178,7 +4178,7 @@ function BuildPicker({
       state: state.state,
       updateState
     });
-  }, [buildId, configPath, state.state]);
+  }, []);
   onInput((input, key) => {
     if (key.escape && ["show-builds", "loading"].includes(state.state)) {
       exit();
@@ -4198,7 +4198,7 @@ function BuildPicker({
     case "no-builds":
       return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(import_ink32.Box, { children: [
         /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(import_ink32.Text, { children: "No eligible builds found " }),
-        /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(import_ink32.Text, { dimColor: true, children: "(i.e. unreleased and successful)" })
+        /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(import_ink32.Text, { dimColor: true, children: "(candidates for smoke-test must be built with @todesktop/runtime@1.2.1 or later)" })
       ] });
     case "selected":
       return children(state.selectedBuildId);
@@ -4399,9 +4399,9 @@ function TestProgress({
     return /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(LoadingText_default, { text: "Loading test stats" });
   }
   return /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(import_jsx_runtime40.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(OsProgress, { os: "Windows", progress: progress.windows }),
-    /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(OsProgress, { os: "macOS", progress: progress.mac }),
-    /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(OsProgress, { os: "Linux", progress: progress.linux })
+    !progress.windows.shouldSkip && /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(OsProgress, { os: "Windows", progress: progress.windows }),
+    !progress.mac.shouldSkip && /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(OsProgress, { os: "macOS", progress: progress.mac }),
+    !progress.linux.shouldSkip && /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(OsProgress, { os: "Linux", progress: progress.linux })
   ] });
 }
 function OsProgress({
@@ -4411,7 +4411,8 @@ function OsProgress({
   const colors = {
     progress: "white",
     error: "red",
-    done: "green"
+    done: "green",
+    skipped: "yellow"
   };
   const text = progress.message + (progress.state === "progress" ? "..." : "");
   return /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
@@ -4457,7 +4458,7 @@ function SmokeTestView({
           BuildError,
           {
             build: state.build,
-            message: (_d = (_c = state.progress) == null ? void 0 : _c.total) == null ? void 0 : _d.message
+            message: (_d = (_c = state.progress) == null ? void 0 : _c.total) == null ? void 0 : _d.error
           }
         )
       ] });
@@ -4525,7 +4526,7 @@ async function cancelSmokeTest({
   buildId,
   userId
 }) {
-  await postToFirebaseFunction_default("cancelSmokeTest", {
+  await postToFirebaseFunction_default("cancelSmokeTest_HTTP", {
     appId,
     buildId,
     userId
@@ -4563,7 +4564,7 @@ async function queueSmokeTest({
   userId
 }) {
   try {
-    await postToFirebaseFunction_default("queueSmokeTest", {
+    await postToFirebaseFunction_default("queueSmokeTest_HTTP", {
       appId,
       buildId,
       nodeVersion,
@@ -4605,9 +4606,27 @@ async function waitUntilFinished({
   });
 }
 function makeProgress(build) {
-  const def = { progress: 0, state: "progress" };
-  const { linux = def, mac = def, windows = def } = build.smokeTest;
-  const platforms = [linux, mac, windows];
+  var _a, _b, _c, _d, _e, _f;
+  const def = {
+    progress: 0,
+    state: "progress",
+    shouldSkip: false
+  };
+  const linux = {
+    ...((_a = build.smokeTest) == null ? void 0 : _a.linux) || def,
+    shouldSkip: ((_b = build.linux) == null ? void 0 : _b.shouldSkip) || false
+  };
+  const mac = {
+    ...((_c = build.smokeTest) == null ? void 0 : _c.mac) || def,
+    shouldSkip: ((_d = build.mac) == null ? void 0 : _d.shouldSkip) || false
+  };
+  const windows = {
+    ...((_e = build.smokeTest) == null ? void 0 : _e.windows) || def,
+    shouldSkip: ((_f = build.windows) == null ? void 0 : _f.shouldSkip) || false
+  };
+  const platforms = [linux, mac, windows].filter(
+    (p) => !p.shouldSkip && p.state !== "skipped"
+  );
   const isFinished = platforms.every((p) => p.state !== "progress");
   let totalState = "progress";
   if (platforms.every((p) => p.state === "done")) {
@@ -4621,10 +4640,7 @@ function makeProgress(build) {
     mac,
     windows,
     total: {
-      message: platforms.filter((p) => p.state === "error").map((p) => p.message).join("\n\n"),
-      progress: Math.round(
-        (linux.progress + mac.progress + windows.progress) / 3
-      ),
+      error: platforms.filter((p) => p.state === "error").map((p) => p.message).join("\n\n"),
       state: totalState
     }
   };
@@ -4668,7 +4684,7 @@ function SmokeTestContainer({
   const abortSignal = abortController.signal;
   (0, import_react22.useEffect)(() => {
     smokeTestWorkflow({ abortSignal, buildId, configPath, updateState });
-  }, [buildId, configPath]);
+  }, []);
   function updateState(changes) {
     setState((previousState) => ({ ...previousState, ...changes }));
     if (["build-error", "complete", "progress-error"].includes(changes.state)) {
@@ -4795,7 +4811,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.6.3",
+  version: "1.7.0-1",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -4875,7 +4891,7 @@ var package_default = {
     "xdg-basedir": "^4.0.0"
   },
   devDependencies: {
-    "@todesktop/shared": "^7.160.0",
+    "@todesktop/shared": "^7.179.0",
     "@types/bunyan": "^1.8.6",
     "@types/react": "^18.0.26",
     "@typescript-eslint/eslint-plugin": "^5.46.1",