fixes or something

Author: claude

.dagger/bun.lock

@@ -81,7 +81,7 @@ type DeployBetterSkillCappedOptions = {
 
 export async function deployBetterSkillCapped(
   options: DeployBetterSkillCappedOptions,
-): Promise<string> {
+): Promise<{ message: string; versionedRef: string }> {
   const {
     source,
     version,
@@ -124,13 +124,13 @@ export async function deployBetterSkillCapped(
     );
 
   const fetcherImage = "ghcr.io/shepherdjerred/better-skill-capped-fetcher";
-  await publishToGhcrMultiple({
+  const refs = await publishToGhcrMultiple({
     container: fetcherContainer,
     imageRefs: [`${fetcherImage}:${version}`, `${fetcherImage}:latest`],
     username: ghcrUsername,
     password: ghcrPassword,
   });
   outputs.push("✓ Fetcher published to GHCR");
 
-  return outputs.join("\n");
+  return { message: outputs.join("\n"), versionedRef: refs[0] ?? "" };
 }

.dagger/src/better-skill-capped.ts

@@ -287,11 +287,11 @@ type BirmelPublishOptions = {
 export async function publishBirmel(options: BirmelPublishOptions): Promise<string> {
   const { source, version, gitSha, registryUsername, registryPassword } = options;
   const image = buildBirmelImage(source, version, gitSha);
-  const refs = await publishBirmelImageWithContainer({
+  const result = await publishBirmelImageWithContainer({
     image, version, gitSha,
     registryAuth: { username: registryUsername, password: registryPassword },
   });
-  return `Published:\n${refs.join("\n")}`;
+  return `Published:\n${result.refs.join("\n")}`;
 }
 
 /** Run birmel CI, smoke test, and publish. */
@@ -301,17 +301,17 @@ export async function releaseBirmel(options: BirmelPublishOptions): Promise<stri
   outputs.push(await checkBirmel(source));
   const birmelImage = buildBirmelImage(source, version, gitSha);
   outputs.push(await smokeTestBirmelImageWithContainer(birmelImage));
-  const refs = await publishBirmelImageWithContainer({
+  const publishResult = await publishBirmelImageWithContainer({
     image: birmelImage, version, gitSha,
     registryAuth: { username: registryUsername, password: registryPassword },
   });
-  outputs.push(`Published:\n${refs.join("\n")}`);
+  outputs.push(`Published:\n${publishResult.refs.join("\n")}`);
   return outputs.join("\n\n");
 }
 
 export async function publishBirmelImageWithContainer(
   options: PublishBirmelImageWithContainerOptions,
-): Promise<string[]> {
+): Promise<{ refs: string[]; versionedRef: string }> {
   let image = options.image;
 
   // Set up registry authentication if credentials provided
@@ -331,5 +331,5 @@ export async function publishBirmelImageWithContainer(
   );
   const latestRef = await image.publish("ghcr.io/shepherdjerred/birmel:latest");
 
-  return [versionRef, shaRef, latestRef];
+  return { refs: [versionRef, shaRef, latestRef], versionedRef: versionRef };
 }

.dagger/src/birmel.ts

@@ -390,7 +390,7 @@ type DeployDiscordPlaysPokemonOptions = {
 
 export async function deployDiscordPlaysPokemon(
   options: DeployDiscordPlaysPokemonOptions,
-): Promise<string> {
+): Promise<{ message: string; versionedRef: string }> {
   const {
     source,
     version,
@@ -439,5 +439,5 @@ export async function deployDiscordPlaysPokemon(
   outputs.push(`Docs deployed to S3\n${syncOutput}`);
 
   logWithTimestamp("Deploy completed for discord-plays-pokemon");
-  return outputs.join("\n");
+  return { message: outputs.join("\n"), versionedRef: refs[0] ?? "" };
 }

.dagger/src/discord-plays-pokemon.ts

@@ -62,5 +62,6 @@ export async function buildAndPushCaddyS3ProxyImage(
   return {
     status: "passed",
     message: `Image published: ${result}`,
+    publishRef: result,
   };
 }

.dagger/src/homelab-caddy-s3proxy.ts

@@ -25,6 +25,7 @@ import { HELM_CHARTS } from "./homelab-helm.ts";
 import { Stage } from "./lib-types.ts";
 import type { StepResult, HelmBuildResult, HomelabSecrets } from "./homelab-index.ts";
 import { homelabTestHelm, homelabTestRenovateRegex, homelabHelmBuild } from "./homelab-index.ts";
+import { formatVersionWithDigest } from "./lib-ghcr.ts";
 import { planAll } from "./homelab-tofu.ts";
 import versions from "./lib-versions.ts";
 
@@ -216,6 +217,7 @@ type PublishResults = {
   caddyS3ProxyPublishResult: StepResult;
   helmPublishResult: StepResult;
   syncResult: StepResult;
+  infraVersions: Record<string, string>;
 };
 
 type HelmPublishOptions = {
@@ -302,6 +304,7 @@ export async function runPublishPhase(
         status: "skipped",
         message: "[SKIPPED] Not prod or chart publish failed",
       },
+      infraVersions: {},
     };
   }
 
@@ -319,7 +322,7 @@ export async function runPublishPhase(
     haResults,
     depSummaryResults,
     dnsAuditResults,
-    caddyS3ProxyResult,
+    caddyS3ProxyResults,
     helmResult,
   ] = await Promise.all([
     Promise.all([
@@ -368,23 +371,20 @@ export async function runPublishPhase(
         false,
       ),
     ]),
-    (async (): Promise<StepResult> => {
-      const [versioned, latest] = await Promise.all([
-        buildAndPushCaddyS3ProxyImage(
-          `ghcr.io/shepherdjerred/caddy-s3proxy:${chartVersion}`,
-          ghcrUsername,
-          ghcrPassword,
-          false,
-        ),
-        buildAndPushCaddyS3ProxyImage(
-          `ghcr.io/shepherdjerred/caddy-s3proxy:latest`,
-          ghcrUsername,
-          ghcrPassword,
-          false,
-        ),
-      ]);
-      return combinePublishResults([versioned, latest]);
-    })(),
+    Promise.all([
+      buildAndPushCaddyS3ProxyImage(
+        `ghcr.io/shepherdjerred/caddy-s3proxy:${chartVersion}`,
+        ghcrUsername,
+        ghcrPassword,
+        false,
+      ),
+      buildAndPushCaddyS3ProxyImage(
+        `ghcr.io/shepherdjerred/caddy-s3proxy:latest`,
+        ghcrUsername,
+        ghcrPassword,
+        false,
+      ),
+    ]),
     helmBuildResult.dist
       ? homelabHelmPublishBuilt({
           builtDist: helmBuildResult.dist,
@@ -401,6 +401,20 @@ export async function runPublishPhase(
 
   const helmPublishResult = helmResult;
 
+  // Extract digests from versioned-tag results (index [0] of each pair)
+  const infraVersions: Record<string, string> = {};
+  const infraMapping: [string, StepResult][] = [
+    ["shepherdjerred/homelab", haResults[0]],
+    ["shepherdjerred/dependency-summary", depSummaryResults[0]],
+    ["shepherdjerred/dns-audit", dnsAuditResults[0]],
+    ["shepherdjerred/caddy-s3proxy", caddyS3ProxyResults[0]],
+  ];
+  for (const [key, result] of infraMapping) {
+    if (result.status === "passed" && result.publishRef !== undefined) {
+      infraVersions[key] = formatVersionWithDigest(chartVersion, result.publishRef);
+    }
+  }
+
   let syncResult: StepResult = {
     status: "skipped",
     message: "[SKIPPED] Not prod or chart publish failed",
@@ -413,9 +427,10 @@ export async function runPublishPhase(
     haPublishResult: combinePublishResults(haResults),
     depSummaryPublishResult: combinePublishResults(depSummaryResults),
     dnsAuditPublishResult: combinePublishResults(dnsAuditResults),
-    caddyS3ProxyPublishResult: caddyS3ProxyResult,
+    caddyS3ProxyPublishResult: combinePublishResults(caddyS3ProxyResults),
     helmPublishResult,
     syncResult,
+    infraVersions,
   };
 }
 

.dagger/src/homelab-ci-steps.ts

@@ -108,5 +108,6 @@ export async function buildAndPushDependencySummaryImage(
   return {
     status: "passed",
     message: `Dependency-summary image published: ${result}`,
+    publishRef: result,
   };
 }

.dagger/src/homelab-dependency-summary.ts

@@ -45,5 +45,6 @@ export async function buildAndPushDnsAuditImage(
   return {
     status: "passed",
     message: `Dns-audit image published: ${result}`,
+    publishRef: result,
   };
 }

.dagger/src/homelab-dns-audit.ts

@@ -219,5 +219,6 @@ export async function buildAndPushHaImage(
   return {
     status: "passed",
     message: `Image published: ${result}`,
+    publishRef: result,
   };
 }

.dagger/src/homelab-ha.ts

@@ -29,6 +29,7 @@ export type StepStatus = "passed" | "failed" | "skipped";
 export type StepResult = {
   status: StepStatus;
   message: string;
+  publishRef?: string;
 };
 
 export type HelmBuildResult = StepResult & {
@@ -184,7 +185,7 @@ export async function ciHomelab(
   env: Stage,
   secrets: HomelabSecrets,
   versionOnly = false,
-): Promise<string> {
+): Promise<{ summary: string; infraVersions: Record<string, string> }> {
   const source = getHomelabSource(monoRepoSource);
 
   // Update image versions in versions.ts if prod
@@ -210,7 +211,10 @@ export async function ciHomelab(
   );
 
   // Check for failures and return summary
-  return checkForFailures(env, validation, publish);
+  return {
+    summary: checkForFailures(env, validation, publish),
+    infraVersions: publish.infraVersions,
+  };
 }
 
 /**