Compare commits

...

25 Commits

Author SHA1 Message Date
Barcode Betty b4420b3f87 fix(ci): use direct docker login for Gitea registry (CAR-994)
CI / build-and-push (pull_request) Has been cancelled
CI / build-and-push (push) Successful in 11s
docker/login-action@v3 exits 1 against git.farh.net. Replace with a
direct docker login shell command using secrets.REGISTRY_TOKEN via
--password-stdin.

cc @cpfarhood
2026-06-02 14:16:15 +00:00
Savannah Savings 6c71a2a1f8 Merge pull request 'ci(CAR-1041): remove invalid deploy-dev/deploy-uat jobs' (#28) from betty/remove-deploy-jobs into dev
CI / build-and-push (push) Failing after 19s
2026-05-28 19:56:05 +00:00
Flea Flicker e308b15255 ci(CAR-1041): remove invalid deploy-dev/deploy-uat jobs
CI / build-and-push (pull_request) Has been skipped
Remove deploy-dev and deploy-uat CI jobs. CartSnitch uses Flux GitOps —
CI builds images, Flux deploys. These Actions-based deployment jobs were
added incorrectly in CAR-987.

Co-Authored-By: Barcode Betty <betty@cartsnitch>
2026-05-28 19:47:39 +00:00
Chris Farhood eca23fe515 Add .mcp.json
CI / build-and-push (push) Failing after 10s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
2026-05-25 21:45:18 +00:00
Savannah Savings d066c14d4b Merge pull request 'Add *.farh.net origins to trustedOrigins (CAR-1034)' (#26) from betty/car-1034-trustedorigins-fix into dev
CI / build-and-push (push) Failing after 8s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
CI / build-and-push (pull_request) Has been skipped
CI / deploy-uat (pull_request) Has been skipped
CI / deploy-dev (pull_request) Has been skipped
2026-05-25 21:27:53 +00:00
Barcode Betty 23ab939d2f Add *.farh.net origins back to trustedOrigins
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
Fixes 403 errors on UAT auth endpoints (cartsnitch.uat.farh.net).
The previous change removed *.farh.net origins causing Better Auth
to reject requests from UAT environment.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-25 09:43:43 +00:00
Savannah Savings 359d108fee Merge pull request 'ci: use REGISTRY_TOKEN for docker login (CAR-1024)' (#24) from car-1023-use-registry-token into dev
CI / build-and-push (push) Failing after 6s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
2026-05-24 20:52:35 +00:00
Barcode Betty f0291e8827 ci: use REGISTRY_TOKEN instead of GITEA_TOKEN for docker login (CAR-1024)
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
Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-24 20:46:48 +00:00
Savannah Savings 720a5f131c Merge pull request 'Promote to Production: CAR-894 Gitea workflows migration' (#23) from uat into main
CI / deploy-uat (push) Has been skipped
CI / build-and-push (push) Failing after 4s
CI / deploy-dev (push) Has been skipped
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
2026-05-24 18:51:45 +00:00
Savannah Savings e36eaec97b Merge pull request 'promote: dev → uat (CAR-992 trustedOrigins fix)' (#19) from dev into uat
CI / build-and-push (push) Failing after 3s
CI / deploy-uat (push) Has been skipped
CI / deploy-dev (push) Has been skipped
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
promote: dev → uat (CAR-992 trustedOrigins fix) (#19)
2026-05-23 20:55:58 +00:00
Savannah Savings 9e6dfe1f9c Merge pull request 'fix: update trustedOrigins to match current domains' (#18) from cs_betty/auth:car992-fix into dev
CI / build-and-push (push) Failing after 6s
CI / build-and-push (pull_request) Has been skipped
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
CI / deploy-dev (pull_request) Has been skipped
CI / deploy-uat (pull_request) Has been skipped
fix: update trustedOrigins to match current domains (#18)

Refs: CAR-992
2026-05-23 20:55:32 +00:00
Barcode Betty 9ae3161860 fix: update trustedOrigins to match current domains
CI / build-and-push (pull_request) Has been cancelled
CI / deploy-dev (pull_request) Has been cancelled
CI / deploy-uat (pull_request) Has been cancelled
Replace stale .farh.net subdomains with correct *.cartsnitch.com domains to fix
CORS Origin validation blocking UAT auth (403 on sign-up/sign-in).

Refs: CAR-992
Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-23 20:43:31 +00:00
Checkout Charlie 5d2701ef52 chore: re-trigger CI for UAT registry verification (CAR-983)
CI / build-and-push (push) Failing after 5s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
2026-05-23 18:37:10 +00:00
Savannah Savings c06f7cf5a1 Merge pull request 'ci: promote dev to uat — Gitea container registry CI changes' (#13) from dev into uat
CI / build-and-push (push) Failing after 1m33s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
ci: promote dev to uat — Gitea container registry CI changes (#13)
2026-05-23 15:26:07 +00:00
Savannah Savings c1c89e4206 Merge pull request 'ci: switch Docker image push from GHCR to Gitea container registry' (#12) from barcode-betty/car-959-gitea-registry into dev
CI / build-and-push (pull_request) Has been skipped
CI / build-and-push (push) Failing after 4m18s
CI / deploy-dev (pull_request) Has been skipped
CI / deploy-uat (pull_request) Has been skipped
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
ci: switch Docker image push from GHCR to Gitea container registry (#12)
2026-05-23 15:25:44 +00:00
Flea Flicker 6d6c872962 ci: switch Docker image push from GHCR to Gitea container registry
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
- REGISTRY: ghcr.io -> git.farh.net
- Renamed login step to Gitea Container Registry
- kustomize rename form: ghcr.io/cartsnitch/auth=git.farh.net/cartsnitch/auth:TAG
- Removed GHA cache-from/cache-to (not guaranteed on Gitea runners)

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-23 15:15:07 +00:00
Savannah Savings 34c5a85d49 Merge pull request 'chore: promote dev to uat (move workflows to .gitea)' (#10) from dev into uat
CI / build-and-push (push) Failing after 5s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
chore: promote dev to uat — move workflows to .gitea (#10)
2026-05-21 13:46:13 +00:00
Savannah Savings ebfefd6970 Merge pull request 'chore: move workflows from .github to .gitea' (#9) from barcode-betty/move-workflows-to-gitea into dev
CI / build-and-push (push) Failing after 6s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
CI / build-and-push (pull_request) Has been skipped
CI / deploy-uat (pull_request) Has been skipped
CI / deploy-dev (pull_request) Has been skipped
chore: move workflows from .github to .gitea (#9)

Merge PR: barcode-betty/move-workflows-to-gitea -> dev
Reviewed-by: Savannah Savings (CTO)
QA-by: Checkout Charlie
2026-05-21 13:45:52 +00:00
Flea Flicker 8bf7c08950 chore: move workflows from .github to .gitea
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
Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-21 12:33:43 +00:00
Savannah Savings 6b8939fd7f Merge pull request 'chore: promote Gitea Actions fix to uat (CAR-892)' (#8) from dev into uat
CI / build-and-push (push) Failing after 6s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
chore: promote Gitea Actions fix to uat (CAR-892)

Dev→UAT promotion. GHCR login fix.

cc @cpfarhood
2026-05-21 11:55:50 +00:00
Barcode Betty f2a2673061 Merge pull request 'fix: use GITEA_TOKEN for GHCR login in Gitea Actions (CAR-892)' (#7) from betty/car-892-gitea-actions-ghcr-auth into dev
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
CI / build-and-push (pull_request) Has been skipped
CI / build-and-push (push) Failing after 6s
CI / deploy-uat (pull_request) Has been skipped
CI / deploy-dev (pull_request) Has been skipped
2026-05-21 11:33:27 +00:00
Barcode Betty dad3132fdb fix: use GITEA_TOKEN for GHCR login in Gitea Actions
CI / build-and-push (push) Failing after 6s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
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
Replace ${{ secrets.GITHUB_TOKEN }} with ${{ secrets.GITEA_TOKEN }}
for docker/login-action in Gitea Actions. GITHUB_TOKEN is not available
in Gitea Actions and was causing 'authentication required' failures for
ghcr.io push, leaving the auth service with a stale image on UAT.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-21 11:30:57 +00:00
Savannah Savings 934397a073 Merge pull request 'ci: promote Gitea Actions workflow changes to UAT' (#6) from dev into uat
CI / build-and-push (push) Failing after 6s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
ci: promote Gitea Actions workflow changes to UAT (#6)
2026-05-21 11:11:55 +00:00
Savannah Savings 80093752ae Merge pull request 'ci: convert GitHub Actions to Gitea Actions (ubuntu-latest)' (#5) from betty/car-869-gitea-actions-auth into dev
CI / build-and-push (push) Failing after 6s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
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
ci: convert GitHub Actions to Gitea Actions (ubuntu-latest) (#5)
2026-05-21 11:11:20 +00:00
Flea Flicker 791ac3156f ci: convert GitHub Actions to Gitea Actions (ubuntu-latest)
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
- Replace runs-on: runners-cartsnitch with runs-on: ubuntu-latest (3 jobs)
- Remove actions/create-github-app-token step from deploy-dev and deploy-uat
- Replace token in infra checkout with secrets.GITEA_TOKEN

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-21 04:01:09 +00:00
4 changed files with 84 additions and 173 deletions
+70
View File
@@ -0,0 +1,70 @@
name: CI
on:
push:
branches: [main, dev, uat]
pull_request:
branches: [main, dev, uat]
concurrency:
group: ci-${{ github.ref }}
cancel-in-progress: true
permissions:
contents: write
packages: write
security-events: write
env:
REGISTRY: git.farh.net
IMAGE_NAME: cartsnitch/auth
jobs:
build-and-push:
runs-on: ubuntu-latest
if: github.event_name == 'push'
outputs:
calver_tag: ${{ steps.calver.outputs.version }}
sha_tag: sha-${{ github.sha }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Generate CalVer tag
id: calver
if: github.ref == 'refs/heads/main'
run: |
DATE_TAG=$(date -u +%Y.%m.%d)
EXISTING=$(git tag -l "v${DATE_TAG}*" | sort -V | tail -1)
if [ -z "$EXISTING" ]; then VERSION="$DATE_TAG"
elif [ "$EXISTING" = "v${DATE_TAG}" ]; then VERSION="${DATE_TAG}.2"
else BUILD_NUM=$(echo "$EXISTING" | sed "s/v${DATE_TAG}\.//"); VERSION="${DATE_TAG}.$((BUILD_NUM + 1))"; fi
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
- name: Log in to Gitea Container Registry
run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login ${{ env.REGISTRY }} -u "${{ github.actor }}" --password-stdin
- name: Extract metadata
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=sha,prefix=sha-,format=long
type=raw,value=${{ steps.calver.outputs.version }},enable=${{ github.ref == 'refs/heads/main' }}
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
- name: Build and push Docker image
uses: docker/build-push-action@v6
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
- name: Create git tag
if: github.ref == 'refs/heads/main'
run: |
git tag "v${{ steps.calver.outputs.version }}"
git push origin "v${{ steps.calver.outputs.version }}"
-172
View File
@@ -1,172 +0,0 @@
name: CI
on:
push:
branches: [main, dev, uat]
pull_request:
branches: [main, dev, uat]
concurrency:
group: ci-${{ github.ref }}
cancel-in-progress: true
permissions:
contents: write
packages: write
security-events: write
env:
REGISTRY: ghcr.io
IMAGE_NAME: cartsnitch/auth
jobs:
build-and-push:
runs-on: runners-cartsnitch
if: github.event_name == 'push'
outputs:
calver_tag: ${{ steps.calver.outputs.version }}
sha_tag: sha-${{ github.sha }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Generate CalVer tag
id: calver
if: github.ref == 'refs/heads/main'
run: |
DATE_TAG=$(date -u +%Y.%m.%d)
EXISTING=$(git tag -l "v${DATE_TAG}*" | sort -V | tail -1)
if [ -z "$EXISTING" ]; then VERSION="$DATE_TAG"
elif [ "$EXISTING" = "v${DATE_TAG}" ]; then VERSION="${DATE_TAG}.2"
else BUILD_NUM=$(echo "$EXISTING" | sed "s/v${DATE_TAG}\.//"); VERSION="${DATE_TAG}.$((BUILD_NUM + 1))"; fi
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
- name: Log in to GHCR
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=sha,prefix=sha-,format=long
type=raw,value=${{ steps.calver.outputs.version }},enable=${{ github.ref == 'refs/heads/main' }}
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
- name: Build and push Docker image
uses: docker/build-push-action@v6
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
- name: Create git tag
if: github.ref == 'refs/heads/main'
run: |
git tag "v${{ steps.calver.outputs.version }}"
git push origin "v${{ steps.calver.outputs.version }}"
deploy-dev:
runs-on: runners-cartsnitch
needs: [build-and-push]
if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main')
steps:
- name: Generate GitHub App token
id: app-token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.CARTSNITCH_APP_ID }}
private-key: ${{ secrets.CARTSNITCH_APP_PRIVATE_KEY }}
owner: ${{ github.repository_owner }}
repositories: infra
- uses: actions/checkout@v4
with:
repository: cartsnitch/infra
token: ${{ steps.app-token.outputs.token }}
ref: main
path: infra
- uses: imranismail/setup-kustomize@v2
- name: Determine image tag
id: tag
run: |
if [ "${{ github.ref }}" == "refs/heads/main" ]; then
echo "tag=${{ needs.build-and-push.outputs.calver_tag }}" >> "$GITHUB_OUTPUT"
else
echo "tag=${{ needs.build-and-push.outputs.sha_tag }}" >> "$GITHUB_OUTPUT"
fi
- name: Update auth image tag in dev overlay
run: |
cd infra/apps/overlays/dev
kustomize edit set image ghcr.io/cartsnitch/auth:${{ steps.tag.outputs.tag }}
- name: Commit and push to infra
run: |
cd infra
git config user.name "cartsnitch-ci[bot]"
git config user.email "cartsnitch-ci[bot]@users.noreply.github.com"
git add apps/overlays/dev/kustomization.yaml
git diff --cached --quiet && echo "No changes" && exit 0
git commit -m "ci(dev): update auth image from cartsnitch/auth CI"
git pull --rebase origin main
git push origin main
deploy-uat:
runs-on: runners-cartsnitch
needs: [build-and-push]
if: github.event_name == 'push' && (github.ref == 'refs/heads/uat' || github.ref == 'refs/heads/main')
steps:
- name: Generate GitHub App token
id: app-token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.CARTSNITCH_APP_ID }}
private-key: ${{ secrets.CARTSNITCH_APP_PRIVATE_KEY }}
owner: ${{ github.repository_owner }}
repositories: infra
- uses: actions/checkout@v4
with:
repository: cartsnitch/infra
token: ${{ steps.app-token.outputs.token }}
ref: main
path: infra
- uses: imranismail/setup-kustomize@v2
- name: Determine image tag
id: tag
run: |
if [ "${{ github.ref }}" == "refs/heads/main" ]; then
echo "tag=${{ needs.build-and-push.outputs.calver_tag }}" >> "$GITHUB_OUTPUT"
else
echo "tag=${{ needs.build-and-push.outputs.sha_tag }}" >> "$GITHUB_OUTPUT"
fi
- name: Update auth image tag in uat overlay
run: |
cd infra/apps/overlays/uat
kustomize edit set image ghcr.io/cartsnitch/auth:${{ steps.tag.outputs.tag }}
- name: Commit and push to infra
run: |
cd infra
git config user.name "cartsnitch-ci[bot]"
git config user.email "cartsnitch-ci[bot]@users.noreply.github.com"
git add apps/overlays/uat/kustomization.yaml
git diff --cached --quiet && echo "No changes" && exit 0
git commit -m "ci(uat): update auth image from cartsnitch/auth CI"
git pull --rebase origin main
git push origin main
+11
View File
@@ -0,0 +1,11 @@
{
"mcpServers": {
"gitea": {
"type": "http",
"url": "https://git-mcp.farh.net/mcp",
"headers": {
"Authorization": "Bearer ${GITEA_TOKEN}"
}
}
}
}
+3 -1
View File
@@ -115,9 +115,11 @@ export const auth = betterAuth({
trustedOrigins: [
"http://localhost:3000",
"http://localhost:5173",
"https://cartsnitch.com",
"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",
],
});