From 628ecd075ee232b932d8a6c9bff221329c6e219e Mon Sep 17 00:00:00 2001 From: Codex Date: Wed, 15 Jul 2026 08:24:36 +0200 Subject: [PATCH] =?UTF-8?q?fix(pikaoa):=20=E9=81=BF=E5=85=8D=20Tekton=20?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=8D=A0=E4=BD=8D=E7=AC=A6=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E6=AD=A3=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/src/pikaoa-test-delivery-renderer.test.ts | 2 ++ scripts/src/pikaoa-test-delivery-renderer.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/src/pikaoa-test-delivery-renderer.test.ts b/scripts/src/pikaoa-test-delivery-renderer.test.ts index e38e2888..d0bc0503 100644 --- a/scripts/src/pikaoa-test-delivery-renderer.test.ts +++ b/scripts/src/pikaoa-test-delivery-renderer.test.ts @@ -99,6 +99,8 @@ describe("PikaOA test PaC renderer", () => { expect(manifest).toContain("pikaoa.unidesk.io/source-commit: __PIKAOA_SOURCE_COMMIT__"); expect(script).toContain('s|__PIKAOA_SOURCE_COMMIT__|$SOURCE_COMMIT|g'); expect(script).toContain("GitOps manifest contains unresolved provenance or image placeholders"); + expect(script).not.toContain("grep -Eq '$(params.revision)"); + expect(script).toContain("grep -Eq '__PIKAOA_SOURCE_COMMIT__|__PIKAOA_(API|WORKER|WEB)_IMAGE__'"); expect(script).toContain("git ls-remote --exit-code --heads"); expect(script).toContain("git -C /workspace/gitops checkout --orphan"); } finally { diff --git a/scripts/src/pikaoa-test-delivery-renderer.ts b/scripts/src/pikaoa-test-delivery-renderer.ts index 51b744e8..94af7c24 100644 --- a/scripts/src/pikaoa-test-delivery-renderer.ts +++ b/scripts/src/pikaoa-test-delivery-renderer.ts @@ -270,7 +270,7 @@ sed -i \\ -e "s|__PIKAOA_WORKER_IMAGE__|$(params.worker-image)|g" \\ -e "s|__PIKAOA_WEB_IMAGE__|$(params.web-image)|g" \\ "$manifest" -if grep -Eq '\$\(params\.revision\)|__PIKAOA_SOURCE_COMMIT__|__PIKAOA_(API|WORKER|WEB)_IMAGE__' "$manifest"; then +if grep -Eq '__PIKAOA_SOURCE_COMMIT__|__PIKAOA_(API|WORKER|WEB)_IMAGE__' "$manifest"; then echo 'GitOps manifest contains unresolved provenance or image placeholders' >&2 exit 6 fi