Compare commits

..

2 Commits

Author SHA1 Message Date
Savannah Savings 0977a7c3b3 Merge pull request 'ci(auth): migrate deploy-dev/deploy-uat to PR-bump + fix registry token (CAR-1263)' (#33) from cs_betty/car-1263-auth-pr-bump-main into main
CI / build-and-push (push) Successful in 10s
CI / deploy-dev (push) Failing after 34s
CI / deploy-uat (push) Failing after 36s
2026-06-05 00:34:48 +00:00
Barcode Betty 21fba7a842 ci(auth): migrate deploy-dev/deploy-uat to PR-bump + fix registry token (CAR-1263)
CI / build-and-push (pull_request) Has been skipped
CI / deploy-dev (pull_request) Has been skipped
CI / deploy-uat (pull_request) Has been skipped
Migrates auth .gitea/workflows/ci.yml deploy-dev and deploy-uat
jobs from direct 'git push origin main' to cartsnitch/infra to the
CAR-1195 PR-bump pattern. Brings auth in line with cartsnitch/cartsnitch
and stops the red deploy-dev/deploy-uat jobs on main pushes.

Also fixes the registry-login password to use REGISTRY_TOKEN (CAR-1009
standard) instead of GITEA_TOKEN — uat already had this fix (CAR-1237);
main was lagging.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-06-05 00:23:07 +00:00
3 changed files with 10 additions and 14 deletions
-1
View File
@@ -1 +0,0 @@
# CI trigger 20260525231507 - post-DinD verification (CAR-1042)
+10 -10
View File
@@ -82,7 +82,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: cartsnitch/infra
token: ${{ secrets.CI_GITEA_TOKEN }}
token: ${{ secrets.GITEA_TOKEN }}
ref: main
path: infra
@@ -116,7 +116,7 @@ jobs:
- name: Commit and push to infra (via PR)
if: needs.build-and-push.result == 'success'
env:
CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
run: |
set -euo pipefail
cd infra
@@ -135,7 +135,7 @@ jobs:
PR_BODY=$(jq -n --arg head "$BRANCH" --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: "main", title: ("ci(dev): update auth image (" + env.GITHUB_SHA[:12] + ")"), body: $body}')
PR_JSON=$(curl -sS -X POST \
-H "Authorization: token ${CI_GITEA_TOKEN}" \
-H "Authorization: token ${GITEA_TOKEN}" \
-H "Content-Type: application/json" \
-d "$PR_BODY" \
"https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls")
@@ -146,7 +146,7 @@ jobs:
fi
echo "Opened cartsnitch/infra PR #${PR_NUM}"
REVIEW_HTTP=$(curl -sS -o /dev/null -w '%{http_code}' -X POST \
-H "Authorization: token ${CI_GITEA_TOKEN}" \
-H "Authorization: token ${GITEA_TOKEN}" \
-H "Content-Type: application/json" \
-d '{"reviewers":["cs_savannah"]}' \
"https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls/${PR_NUM}/requested_reviewers")
@@ -154,7 +154,7 @@ jobs:
echo "::notice::Failed to request reviewers for cartsnitch/infra PR #${PR_NUM} (HTTP ${REVIEW_HTTP}); continuing"
fi
MERGE_RESP=$(curl -sS -X POST \
-H "Authorization: token ${CI_GITEA_TOKEN}" \
-H "Authorization: token ${GITEA_TOKEN}" \
-H "Content-Type: application/json" \
-d '{"Do":"merge","delete_branch_after_merge":true}' \
"https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls/${PR_NUM}/merge")
@@ -181,7 +181,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: cartsnitch/infra
token: ${{ secrets.CI_GITEA_TOKEN }}
token: ${{ secrets.GITEA_TOKEN }}
ref: main
path: infra
@@ -215,7 +215,7 @@ jobs:
- name: Commit and push to infra (via PR)
if: needs.build-and-push.result == 'success'
env:
CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
run: |
set -euo pipefail
cd infra
@@ -234,7 +234,7 @@ jobs:
PR_BODY=$(jq -n --arg head "$BRANCH" --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: "main", title: ("ci(uat): update auth image (" + env.GITHUB_SHA[:12] + ")"), body: $body}')
PR_JSON=$(curl -sS -X POST \
-H "Authorization: token ${CI_GITEA_TOKEN}" \
-H "Authorization: token ${GITEA_TOKEN}" \
-H "Content-Type: application/json" \
-d "$PR_BODY" \
"https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls")
@@ -245,7 +245,7 @@ jobs:
fi
echo "Opened cartsnitch/infra PR #${PR_NUM}"
REVIEW_HTTP=$(curl -sS -o /dev/null -w '%{http_code}' -X POST \
-H "Authorization: token ${CI_GITEA_TOKEN}" \
-H "Authorization: token ${GITEA_TOKEN}" \
-H "Content-Type: application/json" \
-d '{"reviewers":["cs_savannah"]}' \
"https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls/${PR_NUM}/requested_reviewers")
@@ -253,7 +253,7 @@ jobs:
echo "::notice::Failed to request reviewers for cartsnitch/infra PR #${PR_NUM} (HTTP ${REVIEW_HTTP}); continuing"
fi
MERGE_RESP=$(curl -sS -X POST \
-H "Authorization: token ${CI_GITEA_TOKEN}" \
-H "Authorization: token ${GITEA_TOKEN}" \
-H "Content-Type: application/json" \
-d '{"Do":"merge","delete_branch_after_merge":true}' \
"https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls/${PR_NUM}/merge")
-3
View File
@@ -115,9 +115,6 @@ export const auth = betterAuth({
trustedOrigins: [
"http://localhost:3000",
"http://localhost:5173",
"https://cartsnitch.farh.net",
"https://cartsnitch.dev.farh.net",
"https://cartsnitch.uat.farh.net",
"https://cartsnitch.com",
"https://dev.cartsnitch.com",
"https://uat.cartsnitch.com",