From fc3be36fc3eb722dc61bef0347e3fcc2202e2311 Mon Sep 17 00:00:00 2001 From: Barcode Betty <32+cs_betty@noreply.git.farh.net> Date: Tue, 23 Jun 2026 01:07:14 +0000 Subject: [PATCH] =?UTF-8?q?fix(ci):=20revert=20deploy=20PR=20base=20dev/ua?= =?UTF-8?q?t=20=E2=86=92=20main=20(CAR-1431)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .gitea/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index fa817ff..eac1765 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -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 @@ -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