Merge pull request 'fix(ci): broaden graceful-exit on infra PR auto-merge (CAR-1438) [uat→main]' (#49 ) from uat into main

fix(ci): broaden graceful-exit on infra PR auto-merge (CAR-1438) [uat→main] All Phase 3 gates passed: - UAT regression: PASS (CAR-1442, Deal Dottie) - Security review: PASS (CAR-1443, Stockboy Steve) - CEO code review: APPROVED (Carl, review #4830)
Merge pull request 'fix(ci): promote revert deploy PR base dev/uat → main to uat (CAR-1431)' (#51 ) from dev into uat
2026-06-23 01:37:29 +00:00 · 2026-06-23 01:11:16 +00:00 · 2026-06-23 01:10:47 +00:00 · 2026-06-23 01:07:17 +00:00 · 2026-06-23 00:19:02 +00:00
1 changed files with 2 additions and 2 deletions
@@ -143,7 +143,7 @@ jobs:
            exit 0
          fi
          TITLE="ci(dev): update auth image (${GITHUB_SHA::12})"
-          PR_BODY=$(jq -n --arg head "cartsnitch:${BRANCH}" --arg base dev --arg title "$TITLE" --arg body "Bumps apps/overlays/dev/kustomization.yaml auth newTag to \`${{ steps.tag.outputs.tag }}\` from cartsnitch/auth CI build $GITHUB_SHA." \
+          PR_BODY=$(jq -n --arg head "cartsnitch:${BRANCH}" --arg base main --arg title "$TITLE" --arg body "Bumps apps/overlays/dev/kustomization.yaml auth newTag to \`${{ steps.tag.outputs.tag }}\` from cartsnitch/auth CI build $GITHUB_SHA." \
            '{head: $head, base: $base, title: $title, body: $body}')
          PR_JSON=$(curl -sS -X POST \
            -H "Authorization: token ${CI_GITEA_TOKEN}" \
@@ -244,7 +244,7 @@ jobs:
            exit 0
          fi
          TITLE="ci(uat): update auth image (${GITHUB_SHA::12})"
-          PR_BODY=$(jq -n --arg head "cartsnitch:${BRANCH}" --arg base uat --arg title "$TITLE" --arg body "Bumps apps/overlays/uat/kustomization.yaml auth newTag to \`${{ steps.tag.outputs.tag }}\` from cartsnitch/auth CI build $GITHUB_SHA." \
+          PR_BODY=$(jq -n --arg head "cartsnitch:${BRANCH}" --arg base main --arg title "$TITLE" --arg body "Bumps apps/overlays/uat/kustomization.yaml auth newTag to \`${{ steps.tag.outputs.tag }}\` from cartsnitch/auth CI build $GITHUB_SHA." \
            '{head: $head, base: $base, title: $title, body: $body}')
          PR_JSON=$(curl -sS -X POST \
            -H "Authorization: token ${CI_GITEA_TOKEN}" \
Author	SHA1	Message	Date
Barcode Betty	0f375815f2	Merge pull request 'fix(ci): broaden graceful-exit on infra PR auto-merge (CAR-1438) [uat→main]' (#49 ) from uat into main CI / build-and-push (push) Successful in 11s Details CI / deploy-dev (push) Successful in 7s Details CI / deploy-uat (push) Successful in 14s Details fix(ci): broaden graceful-exit on infra PR auto-merge (CAR-1438) [uat→main] All Phase 3 gates passed: - UAT regression: PASS (CAR-1442, Deal Dottie) - Security review: PASS (CAR-1443, Stockboy Steve) - CEO code review: APPROVED (Carl, review #4830)	2026-06-23 01:37:29 +00:00
Barcode Betty	f99dc97528	Merge pull request 'fix(ci): promote revert deploy PR base dev/uat → main to uat (CAR-1431)' (#51 ) from dev into uat CI / build-and-push (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details CI / build-and-push (push) Successful in 8s Details CI / deploy-dev (push) Has been skipped Details CI / deploy-uat (push) Successful in 5s Details fix(ci): promote revert deploy PR base to uat (CAR-1431) Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-06-23 01:11:16 +00:00
Barcode Betty	35b3b8406e	Merge pull request 'fix(ci): revert deploy PR base dev/uat → main (CAR-1431)' (#50 ) from barcode-betty/car-1428-revert-deploy-base into dev CI / build-and-push (push) Successful in 9s Details CI / deploy-dev (push) Successful in 4s Details CI / deploy-uat (push) Has been skipped Details CI / build-and-push (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details fix(ci): revert deploy PR base dev/uat → main (CAR-1431) Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-06-23 01:10:47 +00:00
Barcode Betty	88da9ee771	fix(ci): revert deploy PR base dev/uat → main (CAR-1431) CI / build-and-push (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details Deploy-dev and deploy-uat jobs were opening image-tag-bump PRs against dev/uat branches per CAR-1371. Flux reconciles all overlays from infra main, so those PRs were never picked up. Revert --arg base back to main. Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-06-23 01:07:17 +00:00
Barcode Betty	3a6190a805	Merge pull request 'Promote uat→main: CAR-994 Docker login fix + CAR-1423 REGISTRY_TOKEN fix' (#43 ) from uat into main CI / build-and-push (push) Successful in 11m44s Details CI / deploy-dev (push) Failing after 6s Details CI / deploy-uat (push) Failing after 7s Details Merge uat into main: CAR-994 Docker login fix + CAR-1423 two-stage build + CAR-1270 CI_GITEA_TOKEN fix	2026-06-23 00:19:02 +00:00