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)

.gitea/CI_TRIGGER.md

@@ -0,0 +1 @@
+# CI trigger 20260525231507 - post-DinD verification (CAR-1042)

.gitea/workflows/ci.yml

@@ -59,11 +59,21 @@ jobs:
             type=raw,value=${{ steps.calver.outputs.version }},enable=${{ github.ref == 'refs/heads/main' }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
 
-      - name: Build and push Docker image
+      - name: Build Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          load: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Push Docker image
         uses: docker/build-push-action@v6
         with:
           context: .
           push: true
+          provenance: false
+          sbom: false
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
@@ -132,7 +142,8 @@ jobs:
             echo "::notice::Refusing to push directly to protected branch — falling back to contents API"
             exit 0
           fi
-          PR_BODY=$(jq -n --arg head "cartsnitch:${BRANCH}" --arg base dev --arg title ("ci(dev): update auth image (" + env.GITHUB_SHA[:12] + ")") --arg body "Bumps apps/overlays/dev/kustomization.yaml auth newTag to \`${{ steps.tag.outputs.tag }}\` from cartsnitch/auth CI build $GITHUB_SHA." \
+          TITLE="ci(dev): update auth image (${GITHUB_SHA::12})"
+          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}" \
@@ -166,12 +177,11 @@ jobs:
           MERGED=$(echo "$MERGE_RESP" | jq -r '.merged // false')
           if [ "$MERGED" = "true" ]; then
             echo "PR #${PR_NUM} merged into cartsnitch/infra dev"
-          elif echo "$MERGE_RESP" | grep -qi 'does not have enough approvals'; then
-            echo "::notice::infra PR #${PR_NUM} opened and awaiting CTO (cs_savannah) approve+merge — GitOps approval gate, not a failure"
-            exit 0
           else
-            echo "::error::Auto-merge of cartsnitch/infra PR #${PR_NUM} failed: $MERGE_RESP"
-            exit 1
+            # CAR-1438: PR opened successfully; any non-merged outcome (empty body,
+            # approval-gate, pending checks) is the GitOps gate — not a failure.
+            echo "::notice::infra PR #${PR_NUM} opened — auto-merge not available (${MERGE_RESP:-empty response}); awaiting CTO (cs_savannah) approve+merge"
+            exit 0
           fi
 
   deploy-uat:
@@ -233,7 +243,8 @@ jobs:
             echo "::notice::Refusing to push directly to protected branch — falling back to contents API"
             exit 0
           fi
-          PR_BODY=$(jq -n --arg head "cartsnitch:${BRANCH}" --arg base uat --arg title ("ci(uat): update auth image (" + env.GITHUB_SHA[:12] + ")") --arg body "Bumps apps/overlays/uat/kustomization.yaml auth newTag to \`${{ steps.tag.outputs.tag }}\` from cartsnitch/auth CI build $GITHUB_SHA." \
+          TITLE="ci(uat): update auth image (${GITHUB_SHA::12})"
+          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}" \
@@ -263,10 +274,10 @@ jobs:
           MERGED=$(echo "$MERGE_RESP" | jq -r '.merged // false')
           if [ "$MERGED" = "true" ]; then
             echo "PR #${PR_NUM} merged into cartsnitch/infra uat"
-          elif echo "$MERGE_RESP" | grep -qi 'does not have enough approvals'; then
-            echo "::notice::infra PR #${PR_NUM} opened and awaiting CTO (cs_savannah) approve+merge — GitOps approval gate, not a failure"
-            exit 0
           else
-            echo "::error::Auto-merge of cartsnitch/infra PR #${PR_NUM} failed: $MERGE_RESP"
-            exit 1
+            # CAR-1438: PR opened successfully; any non-merged outcome (empty body,
+            # approval-gate, pending checks) is the GitOps gate — not a failure.
+            echo "::notice::infra PR #${PR_NUM} opened — auto-merge not available (${MERGE_RESP:-empty response}); awaiting CTO (cs_savannah) approve+merge"
+            exit 0
           fi
+