Compare commits

..

20 Commits

Author SHA1 Message Date
Barcode Betty 89fb02cdea ci(CAR-1373): apply dev's deploy-job restoration to uat (resolve 3-way)
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
The dev→uat 3-way merge of ci.yml conflicts on:
- CalVer logic (dev is the multi-line readable form)
- ref: main vs parameterized expression (dev wins, per CAR-1374)
- PR body base/head: dev wins (per CAR-1371 + acceptance criteria)
- CAR-1216 comment: dev added, uat didn't have it

Resolution: take dev's version of ci.yml (the corrected form per CAR-1373).

cc @cpfarhood
2026-06-10 22:47:36 +00:00
Savannah Savings 8a49fc57f1 Merge pull request 'fix(ci): use CI_GITEA_TOKEN for cross-repo infra access in deploy jobs (CAR-1270)' (#34) from betty/car-1270-ci-gitea-token-uat into uat
CI / build-and-push (push) Successful in 9s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Failing after 7s
2026-06-05 05:12:38 +00:00
Barcode Betty d5c5d2b6ba fix(ci): use CI_GITEA_TOKEN for cross-repo infra access in deploy jobs (CAR-1270)
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-06-05 00:53:13 +00:00
Barcode Betty 3198b21683 revert: undo CAR-1270 direct commit (will land via PR instead)
CI / build-and-push (push) Failing after 12m22s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Failing after 27s
Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-06-05 00:52:22 +00:00
Barcode Betty ca1a732033 fix(ci): use CI_GITEA_TOKEN for cross-repo infra access in deploy jobs (CAR-1270)
CI / build-and-push (push) Successful in 7s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Failing after 5s
Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-06-05 00:51:07 +00:00
Savannah Savings eb436e2c31 Merge pull request 'ci(auth): migrate deploy-dev/deploy-uat to PR-bump mechanism (CAR-1263)' (#32) from cs_betty/car-1263-auth-pr-bump-uat into uat
CI / build-and-push (push) Failing after 6s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Failing after 25s
2026-06-05 00:34:47 +00:00
Barcode Betty 70398efeea ci(auth): migrate deploy-dev/deploy-uat to PR-bump mechanism (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 (open + (attempt) auto-merge an infra PR;
never hard-fail on approval gate, per CAR-1216). Brings auth in line
with cartsnitch/cartsnitch and stops the red deploy-uat job on every
uat push.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-06-05 00:23:05 +00:00
Savannah Savings 806843b9c7 Merge pull request 'ci(uat): runner-native Docker build + fix deploy infra token (CAR-1237)' (#30) from betty/car-1237-fix-uat-ci into uat
CI / build-and-push (push) Successful in 15s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Failing after 37s
ci(uat): runner-native Docker build + fix deploy infra token (CAR-1237)

Reviewed and merged by Savannah (CTO). Byte-identical to proven main except the spec-mandated REGISTRY_TOKEN registry-login (CAR-1009 standard).

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-06-04 20:41:13 +00:00
Barcode Betty 91ab376f38 ci(uat): runner-native Docker build + fix deploy infra token (CAR-1237)
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
- Change A: replace build-and-push with runner-native Docker (no DinD service container)
- Change B: deploy-dev/deploy-uat use secrets.GITEA_TOKEN for infra checkout

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-06-04 20:33:08 +00:00
Savannah Savings 3496653d33 Merge dev into uat: use direct docker login for Gitea registry (CAR-994)
CI / build-and-push (push) Successful in 6s
2026-06-04 18:52:32 +00:00
Barcode Betty 02b732e24c chore(ci): re-trigger auth UAT build after act-runner DinD fix (CAR-973)
CI / build-and-push (push) Failing after 15s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-06-04 11:46:31 +00:00
Flea Flicker 1099037db1 fix(ci): use REGISTRY_TOKEN for cross-repo infra checkout
CI / build-and-push (push) Failing after 8s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
Replaces CI_GITEA_TOKEN (which lacks cross-repo access) with REGISTRY_TOKEN
for checkout of cartsnitch/infra in deploy-uat/deploy-dev jobs.

Fixes CAR-1147
2026-06-02 10:07:31 +00:00
Flea Flicker 8c37c764e9 fix(ci): add DinD service to enable image builds (CAR-1042)
CI / build-and-push (push) Failing after 15s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
2026-05-30 08:56:47 +00:00
Flea Flicker 6f392bbbed test(ci): trigger CI after DinD fix (CAR-1042)
CI / build-and-push (push) Failing after 5s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
2026-05-25 23:15:07 +00:00
Barcode Betty 4a63bc1da8 fix(ci): apply CAR-985 and CAR-986 fixes to uat
CI / build-and-push (push) Failing after 5s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
2026-05-25 22:53:44 +00:00
Savannah Savings ca423073f1 Merge pull request 'Promote dev to uat (CAR-1034 - auth *.farh.net trustedOrigins fix)' (#27) from dev into uat
CI / build-and-push (push) Failing after 7s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
2026-05-25 21:28:19 +00:00
Savannah Savings 8bf80a9890 fix(ci): use REGISTRY_TOKEN for container registry auth (CAR-973)
CI / build-and-push (push) Failing after 7s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
The REGISTRY_TOKEN secret has write:package scope for git.farh.net.
This fixes the unauthorized error at docker login.

Related: CAR-1023 (REGISTRY_TOKEN setup), CAR-1009 (CI registry token standardization)

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-25 00:04:25 +00:00
Savannah Savings a520a65f1b fix(ci): use GITEA_TOKEN secret for docker login
CI / build-and-push (push) Failing after 4s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
The github.token (automatic workflow token) in Gitea Actions
doesn't inherit packages:write permission for container registry.
Use the GITEA_TOKEN secret instead with direct docker login.

Ref: CAR-973, CAR-1009
2026-05-24 20:38:35 +00:00
Savannah Savings bb8d7f159c fix(ci): use direct docker login with github.token for registry auth (CAR-973)
CI / build-and-push (push) Failing after 6s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
docker/login-action@v3 fails with Gitea's automatic token.
Use direct docker login with github.token instead, which has
the necessary write:package scope for the container registry.

Related: CAR-1009 (CI registry token standardization)
2026-05-24 20:37:22 +00:00
Barcode Betty a92f578dcf chore: re-trigger CI after DNS fix (CAR-968)
CI / build-and-push (push) Failing after 5s
CI / deploy-dev (push) Has been skipped
CI / deploy-uat (push) Has been skipped
2026-05-24 20:34:39 +00:00
+1
View File
@@ -0,0 +1 @@
# CI trigger 20260525231507 - post-DinD verification (CAR-1042)