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

fix(ci): promote revert deploy PR base to uat (CAR-1431) Co-Authored-By: Paperclip <noreply@paperclip.ing>
Merge pull request 'fix(ci): revert deploy PR base dev/uat → main (CAR-1431)' (#303 ) from barcode-betty/car-1428-revert-deploy-base into dev
2026-06-23 01:53:07 +00:00 · 2026-06-23 01:35:42 +00:00 · 2026-06-23 01:07:14 +00:00 · 2026-06-19 04:02:51 +00:00 · 2026-06-10 22:57:22 +00:00 · 2026-06-10 22:53:10 +00:00
3 changed files with 8 additions and 4 deletions
@@ -484,7 +484,7 @@ jobs:
        with:
          repository: cartsnitch/infra
          token: ${{ secrets.CI_GITEA_TOKEN }}
-          ref: main
+          ref: ${{ github.ref == 'refs/heads/main' && 'main' || (github.ref == 'refs/heads/uat' && 'uat' || 'dev') }}
          path: infra

      - name: Install kubectl
@@ -579,7 +579,7 @@ jobs:
          PR_JSON=$(curl -sS -X POST \
            -H "Authorization: token ${CI_GITEA_TOKEN}" \
            -H "Content-Type: application/json" \
-            -d "$(jq -n --arg head "cartsnitch:${BRANCH}" --arg base dev --arg title "ci(dev): update overlay image tags (${GITHUB_SHA::12})" --arg body "$PR_BODY" '{head:$head,base:$base,title:$title,body:$body}')" \
+            -d "$(jq -n --arg head "cartsnitch:${BRANCH}" --arg base main --arg title "ci(dev): update overlay image tags (${GITHUB_SHA::12})" --arg body "$PR_BODY" '{head:$head,base:$base,title:$title,body:$body}')" \
            "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls")
          PR_NUM=$(echo "$PR_JSON" | jq -r '.number // empty')
          if [ -z "$PR_NUM" ]; then
@@ -630,7 +630,7 @@ jobs:
        with:
          repository: cartsnitch/infra
          token: ${{ secrets.CI_GITEA_TOKEN }}
-          ref: main
+          ref: ${{ github.ref == 'refs/heads/main' && 'main' || (github.ref == 'refs/heads/uat' && 'uat' || 'dev') }}
          path: infra

      - name: Install kubectl
@@ -725,7 +725,7 @@ jobs:
          PR_JSON=$(curl -sS -X POST \
            -H "Authorization: token ${CI_GITEA_TOKEN}" \
            -H "Content-Type: application/json" \
-            -d "$(jq -n --arg head "cartsnitch:${BRANCH}" --arg base uat --arg title "ci(uat): update overlay image tags (${GITHUB_SHA::12})" --arg body "$PR_BODY" '{head:$head,base:$base,title:$title,body:$body}')" \
+            -d "$(jq -n --arg head "cartsnitch:${BRANCH}" --arg base main --arg title "ci(uat): update overlay image tags (${GITHUB_SHA::12})" --arg body "$PR_BODY" '{head:$head,base:$base,title:$title,body:$body}')" \
            "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls")
          PR_NUM=$(echo "$PR_JSON" | jq -r '.number // empty')
          if [ -z "$PR_NUM" ]; then
@@ -0,0 +1,2 @@
+# CAR-1374 verification no-op
+2026-06-10T22:57:17Z CAR-1375 uat regression trigger
@@ -313,3 +313,5 @@ Secrets are managed via **Bitnami Sealed Secrets**. No plain Kubernetes secrets
 ## License

 MIT &copy; 2025 CartSnitch
+
+<!-- CAR-1371 verification: trigger deploy-dev to confirm --arg base dev -->