Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0f375815f2 | |||
| f99dc97528 | |||
| 35b3b8406e | |||
| 88da9ee771 | |||
| ba7bcef05e | |||
| 1af633a619 | |||
| 9600de923c | |||
| 7ff805c3a5 | |||
| 3a6190a805 | |||
| 28d38a298c | |||
| 80a2ea54be |
+11
-12
@@ -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}" \
|
||||
@@ -177,12 +177,11 @@ jobs:
|
||||
MERGED=$(echo "$MERGE_RESP" | jq -r '.merged // false')
|
||||
if [ "$MERGED" = "true" ]; then
|
||||
echo "PR #${PR_NUM} merged into cartsnitch/infra dev"
|
||||
elif echo "$MERGE_RESP" | grep -qi 'does not have enough approvals'; then
|
||||
echo "::notice::infra PR #${PR_NUM} opened and awaiting CTO (cs_savannah) approve+merge — GitOps approval gate, not a failure"
|
||||
exit 0
|
||||
else
|
||||
echo "::error::Auto-merge of cartsnitch/infra PR #${PR_NUM} failed: $MERGE_RESP"
|
||||
exit 1
|
||||
# CAR-1438: PR opened successfully; any non-merged outcome (empty body,
|
||||
# approval-gate, pending checks) is the GitOps gate — not a failure.
|
||||
echo "::notice::infra PR #${PR_NUM} opened — auto-merge not available (${MERGE_RESP:-empty response}); awaiting CTO (cs_savannah) approve+merge"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
deploy-uat:
|
||||
@@ -245,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}" \
|
||||
@@ -275,10 +274,10 @@ jobs:
|
||||
MERGED=$(echo "$MERGE_RESP" | jq -r '.merged // false')
|
||||
if [ "$MERGED" = "true" ]; then
|
||||
echo "PR #${PR_NUM} merged into cartsnitch/infra uat"
|
||||
elif echo "$MERGE_RESP" | grep -qi 'does not have enough approvals'; then
|
||||
echo "::notice::infra PR #${PR_NUM} opened and awaiting CTO (cs_savannah) approve+merge — GitOps approval gate, not a failure"
|
||||
exit 0
|
||||
else
|
||||
echo "::error::Auto-merge of cartsnitch/infra PR #${PR_NUM} failed: $MERGE_RESP"
|
||||
exit 1
|
||||
# CAR-1438: PR opened successfully; any non-merged outcome (empty body,
|
||||
# approval-gate, pending checks) is the GitOps gate — not a failure.
|
||||
echo "::notice::infra PR #${PR_NUM} opened — auto-merge not available (${MERGE_RESP:-empty response}); awaiting CTO (cs_savannah) approve+merge"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user