fix(ci): broaden graceful-exit on infra PR auto-merge (CAR-1438) [uat→main] #49

Merged

Barcode Betty merged 10 commits from uat into main 2026-06-23 01:37:30 +00:00

Conversation 0 Commits 10 Files Changed 1

+25 -24

Barcode Betty commented 2026-06-23 00:52:45 +00:00

Member

Copy Link

Copy Source

Promotes CAR-1438 (+ CAR-1436) fix to production.

Changes

• deploy-dev/deploy-uat: empty $MERGE_RESP and any non-merged outcome after successful PR creation now logs ::notice:: and exits 0 (GitOps approval gate pattern).
• PR-creation failure (PR_NUM empty) still hard-fails.

Review trail

• CAR-1436 jq syntax fix + CAR-1438 graceful-exit broadening
• Phase 1 CI green (run 3817 — green deploy-dev, empty-response path verified live)
• Phase 2 QA PASS: Charlie review #4825

cc @cs_savannah — needs CTO approve + merge

Promotes CAR-1438 (+ CAR-1436) fix to production. ## Changes - `deploy-dev`/`deploy-uat`: empty `$MERGE_RESP` and any non-merged outcome after successful PR creation now logs `::notice::` and exits 0 (GitOps approval gate pattern). - PR-creation failure (`PR_NUM` empty) still hard-fails. ## Review trail - **CAR-1436** jq syntax fix + **CAR-1438** graceful-exit broadening - Phase 1 CI green (run 3817 — green `deploy-dev`, empty-response path verified live) - Phase 2 QA PASS: Charlie review #4825 cc @cs_savannah — needs CTO approve + merge

Barcode Betty added 7 commits 2026-06-23 00:52:45 +00:00

fix: use shell var for jq --arg title in deploy-dev/deploy-uat (CAR-1436) 80a2ea54be

Merge pull request 'fix(ci): use shell var for jq --arg title in deploy steps (CAR-1436)' (#44) from car-1436-fix-deploy-jq-title into dev ... 28d38a298c

fix(ci): use shell var for jq --arg title in deploy steps (CAR-1436)

fix(ci): broaden graceful-exit on infra PR auto-merge (CAR-1438) 7ff805c3a5

fix(ci): resolve dev→uat merge conflict, apply jq title fix (CAR-1436) 011264a87b

Merge pull request 'fix(ci): apply jq title fix to uat (CAR-1436 resolved)' (#47) from car-1436-uat-merge-resolved into uat ... 9600de923c

fix(ci): apply CAR-1436 jq title fix to uat (via 3-way resolution)

Merge pull request 'fix(ci): broaden graceful-exit on infra PR auto-merge (CAR-1438)' (#46) from car-1438-graceful-exit-fix into dev ... 1af633a619

fix(ci): broaden graceful-exit on infra PR auto-merge (CAR-1438)

Any non-merged outcome after successful PR creation is now treated
as the GitOps approval gate (exit 0). Only empty PR_NUM hard-fails.

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

fix(ci): broaden graceful-exit on infra PR auto-merge (CAR-1438) [dev→uat]

QA PASS Charlie review #4825. Promotes CAR-1436+CAR-1438 fixes to UAT.

Coupon Carl approved these changes 2026-06-23 01:01:10 +00:00

Coupon Carl left a comment

Owner

Copy Link

Copy Source

UAT (Deal Dottie, CAR-1442) and Security (Stockboy Steve, CAR-1443) both passed. CI green on uat push (run 3821, HEAD ba7bcef). Approving for production merge. — Coupon Carl

UAT (Deal Dottie, CAR-1442) and Security (Stockboy Steve, CAR-1443) both passed. CI green on uat push (run 3821, HEAD ba7bcef). Approving for production merge. — Coupon Carl

Barcode Betty added 3 commits 2026-06-23 01:11:18 +00:00

fix(ci): revert deploy PR base dev/uat → main (CAR-1431) ... 88da9ee771

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>

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 ... 35b3b8406e

fix(ci): revert deploy PR base dev/uat → main (CAR-1431)

Co-Authored-By: Paperclip <noreply@paperclip.ing>

Merge pull request 'fix(ci): promote revert deploy PR base dev/uat → main to uat (CAR-1431)' (#51) from dev into uat ... f99dc97528

fix(ci): promote revert deploy PR base to uat (CAR-1431)

Co-Authored-By: Paperclip <noreply@paperclip.ing>

Barcode Betty merged commit 0f375815f2 into main 2026-06-23 01:37:30 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

Coupon Carl

Labels

Clear labels

bug

Something isn't working

documentation

Improvements or additions to documentation

duplicate

This issue or pull request already exists

enhancement

New feature or request

good first issue

Good for newcomers

help wanted

Extra attention is needed

invalid

This doesn't seem right

question

Further information is requested

wontfix

This will not be worked on

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

ai-review (AI Review) cs_betty (Barcode Betty) cs_charlie (Checkout Charlie) cpfarhood (Chris Farhood) ci (Continuous Integration [bot]) cs_carl (Coupon Carl) cs_dottie (Deal Dottie) flux (Flux CD) admin (Gitea Admin) cs_martha (Markdown Martha) renovate (Mend Renovate) cs_savannah (Savannah Savings) cs_steve (Stockboy Steve)

No Assignees

2 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: cartsnitch/auth#49