From 56b3b344b205d6a7ea59007e6b576c683b371bf7 Mon Sep 17 00:00:00 2001 From: Codex Date: Tue, 14 Jul 2026 13:01:45 +0200 Subject: [PATCH] fix: use portable selfmedia stage timing --- .../src/platform-infra-pipelines-as-code.ts | 2 +- scripts/src/selfmedia-delivery-renderer.ts | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/src/platform-infra-pipelines-as-code.ts b/scripts/src/platform-infra-pipelines-as-code.ts index 41102446..a6ff3c87 100644 --- a/scripts/src/platform-infra-pipelines-as-code.ts +++ b/scripts/src/platform-infra-pipelines-as-code.ts @@ -2884,7 +2884,7 @@ function envReuseText(envReuse: Record): string { function stageTimingsText(timings: Record): string { const parts = Object.entries(timings) .filter((entry): entry is [string, number] => typeof entry[1] === "number" && Number.isFinite(entry[1])) - .map(([name, milliseconds]) => `${name}=${Math.round(milliseconds)}ms`); + .map(([name, value]) => `${name}=${Math.round(value)}${name.endsWith("Seconds") ? "s" : "ms"}`); return parts.length === 0 ? "-" : parts.join(","); } diff --git a/scripts/src/selfmedia-delivery-renderer.ts b/scripts/src/selfmedia-delivery-renderer.ts index bab3d09a..75ca0ea7 100644 --- a/scripts/src/selfmedia-delivery-renderer.ts +++ b/scripts/src/selfmedia-delivery-renderer.ts @@ -140,7 +140,7 @@ function sourceStep(target: SelfMediaDeliveryTarget, effectiveDeploymentB64: str ], script: `#!/bin/sh set -eu -stage_started_ms=$(date +%s%3N) +stage_started_seconds=$(date +%s) source_commit="$(params.revision)" snapshot_prefix="$(params.source-snapshot-prefix)" rm -rf /workspace/source /workspace/release @@ -171,8 +171,8 @@ bun deploy/scripts/prepare-build.ts \\ --source-commit "$source_commit" \\ --source-snapshot-prefix "$snapshot_prefix" \\ --output-dir /workspace/release -stage_finished_ms=$(date +%s%3N) -printf '{"ok":true,"phase":"source-prepare","stageTimings":{"sourcePrepareMs":%s},"valuesPrinted":false}\n' "$((stage_finished_ms-stage_started_ms))" +stage_finished_seconds=$(date +%s) +printf '{"ok":true,"phase":"source-prepare","stageTimings":{"sourcePrepareSeconds":%s},"valuesPrinted":false}\n' "$((stage_finished_seconds-stage_started_seconds))" `, securityContext: nonRootSecurity(), volumeMounts: [ @@ -205,7 +205,7 @@ function envReuseStep(target: SelfMediaDeliveryTarget): Record imagePullPolicy: "IfNotPresent", script: `#!/bin/sh set -eu -stage_started_ms=$(date +%s%3N) +stage_started_seconds=$(date +%s) identity_file=/home/user/.local/share/buildkit/.unidesk/selfmedia-env-identity for input in ${identityInputs}; do test -f "$input"; done env_identity="sha256:$(sha256sum ${identityInputs} | sha256sum | awk '{print $1}')" @@ -219,8 +219,8 @@ else if [ -n "$previous_identity" ]; then previous_present=true; else previous_present=false; fi fi printf '%s\n' "$env_identity" > /workspace/env-identity -stage_finished_ms=$(date +%s%3N) -printf '{"ok":true,"phase":"env-reuse","envIdentity":"%s","envReuseStatus":"%s","envReuse":{"status":"%s","mode":"${target.build.envReuse.mode}","identitySource":"owning-yaml-source-artifact","previousIdentityPresent":%s},"stageTimings":{"envIdentityMs":%s},"valuesPrinted":false}\n' "$env_identity" "$reuse_status" "$reuse_status" "$previous_present" "$((stage_finished_ms-stage_started_ms))" +stage_finished_seconds=$(date +%s) +printf '{"ok":true,"phase":"env-reuse","envIdentity":"%s","envReuseStatus":"%s","envReuse":{"status":"%s","mode":"${target.build.envReuse.mode}","identitySource":"owning-yaml-source-artifact","previousIdentityPresent":%s},"stageTimings":{"envIdentitySeconds":%s},"valuesPrinted":false}\n' "$env_identity" "$reuse_status" "$reuse_status" "$previous_present" "$((stage_finished_seconds-stage_started_seconds))" `, securityContext: nonRootSecurity(), volumeMounts: [ @@ -242,11 +242,11 @@ function imageBuildStep(target: SelfMediaDeliveryTarget): Record"$askpass" <<'ASKPASS' #!/bin/sh @@ -287,8 +287,8 @@ bun /workspace/source/deploy/scripts/publish-gitops.ts \\ --source-commit "$SOURCE_COMMIT" \\ --worktree /workspace/selfmedia-gitops rm -f "$askpass" -stage_finished_ms=$(date +%s%3N) -printf '{"ok":true,"phase":"gitops-stage","stageTimings":{"gitopsPublishMs":%s},"valuesPrinted":false}\n' "$((stage_finished_ms-stage_started_ms))" +stage_finished_seconds=$(date +%s) +printf '{"ok":true,"phase":"gitops-stage","stageTimings":{"gitopsPublishSeconds":%s},"valuesPrinted":false}\n' "$((stage_finished_seconds-stage_started_seconds))" `, securityContext: nonRootSecurity(), volumeMounts: [