forked from cartsnitch/cartsnitch
Merge pull request 'fix(cartsnitch): deploy-dev/deploy-uat PR base = dev/uat not main (CAR-1370)' (#299) from barcode-betty/car-1370-deploy-base-dev into dev
fix(cartsnitch): deploy-dev/deploy-uat PR base = dev/uat not main (CAR-1370) Two-line swap in .gitea/workflows/ci.yml so deploy-dev targets dev and deploy-uat targets uat instead of main. CAR-1370 / CAR-1371 Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
@@ -579,7 +579,7 @@ jobs:
|
|||||||
PR_JSON=$(curl -sS -X POST \
|
PR_JSON=$(curl -sS -X POST \
|
||||||
-H "Authorization: token ${CI_GITEA_TOKEN}" \
|
-H "Authorization: token ${CI_GITEA_TOKEN}" \
|
||||||
-H "Content-Type: application/json" \
|
-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")
|
"https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls")
|
||||||
PR_NUM=$(echo "$PR_JSON" | jq -r '.number // empty')
|
PR_NUM=$(echo "$PR_JSON" | jq -r '.number // empty')
|
||||||
if [ -z "$PR_NUM" ]; then
|
if [ -z "$PR_NUM" ]; then
|
||||||
@@ -725,7 +725,7 @@ jobs:
|
|||||||
PR_JSON=$(curl -sS -X POST \
|
PR_JSON=$(curl -sS -X POST \
|
||||||
-H "Authorization: token ${CI_GITEA_TOKEN}" \
|
-H "Authorization: token ${CI_GITEA_TOKEN}" \
|
||||||
-H "Content-Type: application/json" \
|
-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")
|
"https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls")
|
||||||
PR_NUM=$(echo "$PR_JSON" | jq -r '.number // empty')
|
PR_NUM=$(echo "$PR_JSON" | jq -r '.number // empty')
|
||||||
if [ -z "$PR_NUM" ]; then
|
if [ -z "$PR_NUM" ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user