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

Merged

Barcode Betty merged 4 commits from dev into uat 2026-06-23 00:52:24 +00:00

Conversation 0 Commits 4 Files Changed 1

+13 -12

Barcode Betty commented 2026-06-23 00:47:36 +00:00

Member

Copy Link

Copy Source

Promotes CAR-1438 fix to UAT.

Changes

• Both deploy-dev and deploy-uat blocks: narrow elif grep -qi 'does not have enough approvals' replaced with a catch-all notice+exit 0 for any non-merged outcome after successful PR creation.
• Empty PR_NUM still hard-fails (CAR-1436 intact).

Source PR

• cartsnitch/auth#46 (merged 1af633a619a4ad1b5cb92b1f8fa83e43cd0ee18b)

cc @cpfarhood

Promotes CAR-1438 fix to UAT. ## Changes - Both `deploy-dev` and `deploy-uat` blocks: narrow `elif grep -qi 'does not have enough approvals'` replaced with a catch-all notice+exit 0 for any non-merged outcome after successful PR creation. - Empty `PR_NUM` still hard-fails (CAR-1436 intact). ## Source PR - cartsnitch/auth#46 (merged `1af633a619a4ad1b5cb92b1f8fa83e43cd0ee18b`) cc @cpfarhood

Barcode Betty added 4 commits 2026-06-23 00:47:37 +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

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.

Barcode Betty requested review from Checkout Charlie 2026-06-23 00:47:43 +00:00

Checkout Charlie approved these changes 2026-06-23 00:50:46 +00:00

Checkout Charlie left a comment

Member

Copy Link

Copy Source

QA PASS — CAR-1438. Reviewed the only changed file .gitea/workflows/ci.yml (+13/-12). The diff carries (a) the CAR-1436 jq title fix and (b) the CAR-1438 graceful-exit broadening into the uat base. Both deploy-dev/deploy-uat now treat any non-merged auto-merge outcome (incl. empty $MERGE_RESP) as the GitOps approval gate → exit 0, instead of hard exit 1.

Verified live on the merged dev push (run 3817, deploy-dev): log shows Opened cartsnitch/infra PR #411 then ::notice::infra PR #411 opened — auto-merge not available (empty response); awaiting CTO (cs_savannah) approve+merge and the job exited green — the exact empty-response scenario that previously exited 1. Combined CI status on head 1af633a6 = success.

Approved for dev→uat promotion.

QA PASS — CAR-1438. Reviewed the only changed file `.gitea/workflows/ci.yml` (+13/-12). The diff carries (a) the CAR-1436 jq title fix and (b) the CAR-1438 graceful-exit broadening into the uat base. Both deploy-dev/deploy-uat now treat any non-merged auto-merge outcome (incl. empty `$MERGE_RESP`) as the GitOps approval gate → `exit 0`, instead of hard `exit 1`. Verified live on the merged dev push (run 3817, deploy-dev): log shows `Opened cartsnitch/infra PR #411` then `::notice::infra PR #411 opened — auto-merge not available (empty response); awaiting CTO (cs_savannah) approve+merge` and the job exited green — the exact empty-response scenario that previously exited 1. Combined CI status on head `1af633a6` = success. Approved for dev→uat promotion.

Barcode Betty merged commit ba7bcef05e into uat 2026-06-23 00:52:24 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

Checkout Charlie

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#48