From 0497ed2b5ca67a7a3c06609fa3a324e3f1af1ca1 Mon Sep 17 00:00:00 2001 From: Flea Flicker Date: Sat, 28 Mar 2026 13:58:49 +0000 Subject: [PATCH] fix: broaden annotation sed pattern, fix PR body link, remove error swallowing (GRO-178) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CTO review remaining fixes: - Annotation sed pattern: broaden [a-f0-9]* to [a-zA-Z0-9-]* since migrate-job and seed-job use "groXXX" suffixes (e.g. "2026.03.28-gro177") which contain non-hex letters - PR body link: fix /d50d9792/issues/GRO-178 → /GRO/issues/GRO-178 - Remove error swallowing: "|| echo" was hiding PR creation failures; let the step fail naturally so CI catches it Co-Authored-By: Paperclip --- .github/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c87868..7ce2d64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -312,11 +312,11 @@ jobs: # Update migrate-job.yaml sed -i "s|ghcr.io/groombook/migrate:[0-9][0-9][0-9][0-9].[0-9][0-9].[0-9][0-9]-[a-f0-9]*|ghcr.io/groombook/migrate:${TAG}|g" apps/groombook/base/migrate-job.yaml - sed -i "s|groombook.app/deploy-version: \"[0-9][0-9][0-9][0-9].[0-9][0-9].[0-9][0-9]-[a-f0-9]*\"|groombook.app/deploy-version: \"${TAG}\"|g" apps/groombook/base/migrate-job.yaml + sed -i "s|groombook.app/deploy-version: \"[a-zA-Z0-9-]*\"|groombook.app/deploy-version: \"${TAG}\"|g" apps/groombook/base/migrate-job.yaml # Update seed-job.yaml sed -i "s|ghcr.io/groombook/seed:[0-9][0-9][0-9][0-9].[0-9][0-9].[0-9][0-9]-[a-f0-9]*|ghcr.io/groombook/seed:${TAG}|g" apps/groombook/base/seed-job.yaml - sed -i "s|groombook.app/deploy-version: \"[0-9][0-9][0-9][0-9].[0-9][0-9].[0-9][0-9]-[a-f0-9]*\"|groombook.app/deploy-version: \"${TAG}\"|g" apps/groombook/base/seed-job.yaml + sed -i "s|groombook.app/deploy-version: \"[a-zA-Z0-9-]*\"|groombook.app/deploy-version: \"${TAG}\"|g" apps/groombook/base/seed-job.yaml git -C /tmp/infra diff --stat @@ -344,6 +344,5 @@ jobs: --base main \ --head "chore/update-image-tags-${TAG}" \ --title "chore: update image tags to ${TAG}" \ - --body "[GRO-178](/d50d9792/issues/GRO-178) — automated image tag update from main merge" \ - --enable-auto-merge \ - 2>&1 || echo "PR creation attempted" + --body "[GRO-178](/GRO/issues/GRO-178) — automated image tag update from main merge" \ + --enable-auto-merge