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

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): broaden graceful-exit on infra PR auto-merge (CAR-1438)' (#46 ) from car-1438-graceful-exit-fix into dev
2026-06-23 01:07:17 +00:00 · 2026-06-23 00:47:23 +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	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	1af633a619	Merge pull request 'fix(ci): broaden graceful-exit on infra PR auto-merge (CAR-1438)' (#46 ) from car-1438-graceful-exit-fix into dev CI / build-and-push (push) Successful in 10s Details CI / build-and-push (pull_request) Has been skipped Details CI / deploy-uat (push) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details CI / deploy-dev (push) Successful in 10s Details 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.	2026-06-23 00:47:23 +00:00