@yunuseon/kayra 0.8.0 → 0.8.1

package/cli/dist/deployer/deployer.js

@@ -13,7 +13,7 @@ import { statusRequest } from "./forge.js";
 import { json, send } from "./http.js";
 import { spawnLines } from "./process.js";
 import { empty, enqueue, finish } from "./queue.js";
-import { expired, releaseName } from "./records.js";
+import { expired, moved, releaseName, releases } from "./records.js";
 import { deploy, renovate } from "./run.js";
 import { runsOf } from "./store.js";
 const token = (name) => {
@@ -195,12 +195,14 @@ const deployRequest = (app, ref, why) => ({
     work: { kind: "deploy", app: app.name, ref, why },
 });
 const jobRequest = (job, dryRun) => ({ owner: jobOwner(job), work: { kind: "job", job, dryRun } });
-/** The webhook's fallback: an app whose ref moved to a commit no run has tried yet. */
+/** The webhook's fallback: an app whose ref moved to a commit no run has tried yet and no release runs (one migrated from Jenkins has releases but no runs). */
 const poll = async (s) => {
     await Promise.all(registeredApps(s).map(async (app) => {
         const commit = await builderResolve(s, app, app.ref);
-        const last = runsOf(runsDir(s), appOwner(app.name)).find((run) => run.sha !== undefined);
-        if (commit.ok && commit.value !== last?.sha)
+        const lastRun = runsOf(runsDir(s), appOwner(app.name)).find((run) => run.sha !== undefined);
+        const releasesDir = join(s.platformDir, "releases", app.name);
+        const lastRelease = releases(existsSync(releasesDir) ? readdirSync(releasesDir) : [])[0];
+        if (commit.ok && moved(commit.value, lastRun?.sha, lastRelease?.sha))
             swap(s, (queue) => enqueue(queue, deployRequest(app, app.ref, "poll")));
     }));
 };

package/cli/dist/deployer/records.js

@@ -12,6 +12,8 @@ export const releases = (names) => names
     return match?.[1] === undefined || !commit.ok ? [] : [{ sha: commit.value, time: match[1] }];
 })
     .filter((release, i, all) => all.findIndex((other) => other.sha === release.sha) === i);
+/** The poll's question: has the ref moved to a commit neither the newest run tried nor the newest release runs? */
+export const moved = (resolved, lastRun, lastRelease) => resolved !== lastRun && resolved !== lastRelease;
 const whys = ["push", "poll", "deploy", "rollback", "schedule", "manual"];
 const states = ["running", "success", "failure"];
 const isWhy = (value) => whys.some((why) => why === value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yunuseon/kayra",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "A self-hosted app platform and the CLI that runs it: Traefik, Authelia, a registry, rootless BuildKit and a small deployer per server, set up with OpenTofu and Ansible.",
   "license": "MIT",
   "author": "Yunus Öztürk",