fix(cartsnitch): deploy-dev/deploy-uat PR base = dev/uat not main (CAR-1370)

Deploy jobs in ci.yml were opening image-tag-bump PRs against cartsnitch/infra: main regardless of which branch triggered the deploy. The deploy-dev job should target dev, deploy-uat should target uat. Two-line swap in .gitea/workflows/ci.yml: - Line 582 (deploy-dev): --arg base main -> --arg base dev - Line 728 (deploy-uat): --arg base main -> --arg base uat Verified by inspecting both curl payloads; no other --arg base occurrences. CAR-1370 / CAR-1371 Co-Authored-By: Paperclip <noreply@paperclip.ing>
Merge pull request 'fix(api): widen alembic_version.version_num in migration 001 (CAR-1302)' (#289 ) from barcode-betty/car-1303-widen-alembic-via-migration into dev
2026-06-10 20:40:48 +00:00 · 2026-06-10 04:53:34 +00:00
1 changed files with 2 additions and 2 deletions
@@ -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 main --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 dev --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
@@ -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 main --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 uat --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
Author	SHA1	Message	Date
Barcode Betty	f504807467	fix(cartsnitch): deploy-dev/deploy-uat PR base = dev/uat not main (CAR-1370) CI / test (pull_request) Successful in 14s Details CI / lint (pull_request) Successful in 15s Details CI / audit (pull_request) Successful in 15s Details CI / e2e (pull_request) Successful in 45s Details CI / build-and-push-receiptwitness (pull_request) Has been skipped Details CI / build-and-push-api (pull_request) Has been skipped Details CI / build-and-push-auth (pull_request) Has been skipped Details 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 CI / lighthouse (pull_request) Successful in 1m1s Details Deploy jobs in ci.yml were opening image-tag-bump PRs against cartsnitch/infra: main regardless of which branch triggered the deploy. The deploy-dev job should target dev, deploy-uat should target uat. Two-line swap in .gitea/workflows/ci.yml: - Line 582 (deploy-dev): --arg base main -> --arg base dev - Line 728 (deploy-uat): --arg base main -> --arg base uat Verified by inspecting both curl payloads; no other --arg base occurrences. CAR-1370 / CAR-1371 Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-06-10 20:40:48 +00:00
Barcode Betty	3aa6459bed	Merge pull request 'fix(api): widen alembic_version.version_num in migration 001 (CAR-1302)' (#289 ) from barcode-betty/car-1303-widen-alembic-via-migration into dev CI / lint (push) Successful in 14s Details CI / build-and-push-receiptwitness (push) Successful in 3m8s Details CI / e2e (push) Successful in 45s Details CI / audit (push) Successful in 12s Details CI / test (push) Successful in 13s Details CI / lighthouse (push) Successful in 58s Details CI / build-and-push-api (push) Successful in 1m45s Details CI / build-and-push-auth (push) Successful in 1m55s Details CI / lint (pull_request) Successful in 16s Details CI / test (pull_request) Successful in 43s Details CI / build-and-push (push) Successful in 1m57s Details CI / e2e (pull_request) Successful in 1m0s Details CI / build-and-push-receiptwitness (pull_request) Has been skipped Details CI / build-and-push-api (pull_request) Has been skipped Details CI / build-and-push-auth (pull_request) Has been skipped Details CI / build-and-push (pull_request) Has been skipped Details CI / lighthouse (pull_request) Successful in 1m15s Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details CI / audit (pull_request) Successful in 15s Details CI / deploy-dev (push) Successful in 14s Details CI / deploy-uat (push) Has been skipped Details fix(api): widen alembic_version.version_num in migration 001 (CAR-1302) Rebased onto current dev head `ad18a43b5` per CAR-1365. Drops `71e3b81` (already in dev via #281). Resolves ci.yml conflict by keeping dev's CAR-1316/1318 fixed version. Self-merge per SDLC Phase 1 (CI green on run #3470).	2026-06-10 04:53:34 +00:00