Compare commits

...

7 Commits

Author SHA1 Message Date
Barcode Betty ba88fad48b fix: remove dead dispose_engine import from API main.py
CI / lint (pull_request) Failing after 3s
CI / test (pull_request) Failing after 14s
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 / typecheck (pull_request) Failing after 20s
The top-level import of dispose_engine from cartsnitch_api.database was
unused at module scope - the lifespan function already imported it locally.
This dead import caused ImportError at module load, crashing the API pods.

Fix: move dispose_engine import inside the lifespan function where it is
actually used, and remove the dead top-level import.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-23 20:54:39 +00:00
Savannah Savings 7fd8e90b9c Merge pull request 'fix(ci): add uat branch to workflow triggers' (#9) from savannah/fix-ci-uat-trigger into dev
CI / deploy-uat (push) Has been skipped
CI / test (pull_request) Failing after 0s
CI / deploy-uat (pull_request) Has been skipped
CI / deploy-dev (push) Failing after 37s
CI / lint (push) Failing after 3s
CI / lint (pull_request) Failing after 4s
CI / build-and-push (pull_request) Has been skipped
CI / deploy-dev (pull_request) Has been skipped
CI / test (push) Failing after 0s
CI / build-and-push (push) Has been skipped
CI / typecheck (push) Failing after 18s
CI / typecheck (pull_request) Failing after 17s
fix(ci): add uat branch to workflow triggers (#9)

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-21 14:38:59 +00:00
Savannah Savings e429786696 fix(ci): add uat branch to workflow triggers
CI / test (pull_request) Failing after 0s
CI / lint (pull_request) Failing after 4s
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 / typecheck (pull_request) Failing after 17s
The on.push and on.pull_request triggers only listed [main, dev].
The deploy-uat job condition checks for refs/heads/uat but the
workflow never fires on uat pushes. Add uat to both trigger lists.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-21 14:37:47 +00:00
Savannah Savings 6b54a5ee7f Merge pull request 'chore: move workflows from .github to .gitea' (#6) from barcode-betty/move-workflows-to-gitea into dev
CI / test (push) Failing after 0s
CI / lint (push) Failing after 5s
CI / build-and-push (push) Has been skipped
CI / deploy-uat (push) Has been skipped
CI / typecheck (push) Failing after 27s
CI / deploy-dev (push) Failing after 31s
chore: move workflows from .github to .gitea (#6)

Part of Gitea migration (CAR-893).
2026-05-21 13:05:07 +00:00
Barcode Betty 4e38dd4a0e chore: move workflows from .github to .gitea
CI / test (pull_request) Failing after 0s
CI / lint (pull_request) Failing after 3s
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 / typecheck (pull_request) Failing after 18s
Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-21 12:30:57 +00:00
Coupon Carl 3a4bf6fb30 Merge pull request 'ci: convert GitHub Actions to Gitea Actions (ubuntu-latest)' (#4) from betty/car-869-gitea-actions-api into dev
CI / test (push) Failing after 0s
CI / lint (push) Failing after 3s
CI / build-and-push (push) Has been skipped
CI / deploy-uat (push) Has been skipped
CI / typecheck (push) Failing after 16s
CI / deploy-dev (push) Failing after 31s
2026-05-21 04:54:50 +00:00
Barcode Betty 0c3c549a6a ci: convert GitHub Actions to Gitea Actions (ubuntu-latest)
CI / test (pull_request) Failing after 1s
CI / lint (pull_request) Failing after 35s
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 / typecheck (pull_request) Failing after 1m6s
- Replace runs-on: runners-cartsnitch with ubuntu-latest (6 jobs)
- Remove SARIF upload step (github/codeql-action/upload-sarif)
- Replace GitHub App token with secrets.GITEA_TOKEN in deploy-dev and deploy-uat

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-21 03:57:49 +00:00
2 changed files with 12 additions and 34 deletions
@@ -2,9 +2,9 @@ name: CI
on:
push:
branches: [main, dev]
branches: [main, dev, uat]
pull_request:
branches: [main, dev]
branches: [main, dev, uat]
concurrency:
group: ci-${{ github.ref }}
@@ -20,7 +20,7 @@ env:
jobs:
lint:
runs-on: runners-cartsnitch
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
@@ -34,7 +34,7 @@ jobs:
run: ruff format --check .
typecheck:
runs-on: runners-cartsnitch
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v4
@@ -49,7 +49,7 @@ jobs:
run: mypy src/cartsnitch_api
test:
runs-on: runners-cartsnitch
runs-on: ubuntu-latest
services:
postgres:
image: postgres:15-alpine
@@ -96,7 +96,7 @@ jobs:
run: pytest --tb=short -q
build-and-push:
runs-on: runners-cartsnitch
runs-on: ubuntu-latest
needs: [lint, test]
outputs:
calver_tag: ${{ steps.calver.outputs.version }}
@@ -172,11 +172,7 @@ jobs:
only-fixed: "true"
output-format: sarif
- name: Upload api scan results to GitHub Security
uses: github/codeql-action/upload-sarif@v3
if: always()
with:
sarif_file: ${{ steps.scan.outputs.sarif }}
- name: Push Docker image
if: github.event_name == 'push'
@@ -198,24 +194,15 @@ jobs:
git push origin "v${{ steps.calver.outputs.version }}"
deploy-dev:
runs-on: runners-cartsnitch
runs-on: ubuntu-latest
needs: [build-and-push]
if: always() && !cancelled() && 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
- name: Checkout infra repo
uses: actions/checkout@v4
with:
repository: cartsnitch/infra
token: ${{ steps.app-token.outputs.token }}
token: ${{ secrets.GITEA_TOKEN }}
ref: main
path: infra
@@ -251,24 +238,15 @@ jobs:
git push origin main
deploy-uat:
runs-on: runners-cartsnitch
runs-on: ubuntu-latest
needs: [build-and-push]
if: always() && !cancelled() && 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
- name: Checkout infra repo
uses: actions/checkout@v4
with:
repository: cartsnitch/infra
token: ${{ steps.app-token.outputs.token }}
token: ${{ secrets.GITEA_TOKEN }}
ref: main
path: infra
+1 -1
View File
@@ -6,7 +6,6 @@ from fastapi import APIRouter, FastAPI
from cartsnitch_api.auth.routes import router as auth_router
from cartsnitch_api.cache import cache_client
from cartsnitch_api.database import dispose_engine
from cartsnitch_api.middleware.cors import add_cors_middleware
from cartsnitch_api.middleware.error_handler import add_error_handlers, add_error_monitor_middleware
from cartsnitch_api.middleware.rate_limit import add_rate_limit_middleware
@@ -26,6 +25,7 @@ from cartsnitch_api.routes.user import router as user_router
@asynccontextmanager
async def lifespan(app: FastAPI):
from cartsnitch_api.database import dispose_engine
await cache_client.initialize()
yield
await cache_client.close()