Enable beta auto-deploy on master; prod via manual button

Closes #26. Split deploy.yml into deploy-beta (push→master) and deploy-prod (workflow_dispatch), wire beta hosts/CORS defaults, and document beta secret + Tianji coordination with chat_web_app.
2026-07-27 10:26:21 -05:00
parent acb3a51618
commit 02cee6c220
7 changed files with 176 additions and 28 deletions
@@ -0,0 +1,82 @@
+name: Deploy Beta
+
+# Auto-deploy beta after push to master (mirrors dta_service / chat_web_app).
+# Prod is manual via Deploy Prod (workflow_dispatch).
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  unit-tests:
+    runs-on: self-hosted
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install uv
+        run: |
+          curl -LsSf https://astral.sh/uv/install.sh | sh
+          echo "$HOME/.local/bin" >> "$GITHUB_PATH"
+
+      - name: Install dependencies
+        run: uv sync --frozen
+
+      - name: Run unit tests
+        env:
+          DJANGO_ENV: dev
+          DJANGO_SECRET_KEY: test-secret-key
+          DJANGO_DEBUG: "true"
+          DJANGO_ALLOWED_HOSTS: localhost,127.0.0.1,testserver
+          DATABASE_URL: ""
+          DB_HOST: ""
+          SKIP_RAG_INIT: "1"
+          OLLAMA_BASE_URL: http://127.0.0.1:11434
+        working-directory: llm_be
+        run: uv run python manage.py test
+
+  docker:
+    needs: unit-tests
+    runs-on: self-hosted
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build Docker image
+        run: docker compose build
+
+      # Ephemeral local Postgres only — never inherit host DATABASE_URL (prod/beta).
+      - name: Run containerized tests
+        run: |
+          set -euo pipefail
+          unset DATABASE_URL DB_HOST DB_NAME DB_USER DB_PASSWORD DB_PORT \
+            COMPOSE_DATABASE_URL DJANGO_ENV DJANGO_SECRET_KEY DJANGO_DEBUG \
+            DJANGO_ALLOWED_HOSTS OLLAMA_BASE_URL || true
+
+          PROJECT="chat-backend-ci-${{ gitea.sha }}"
+          cleanup() { docker compose -p "$PROJECT" down -v --remove-orphans || true; }
+          trap cleanup EXIT
+
+          docker compose -p "$PROJECT" up -d --wait db
+          docker compose -p "$PROJECT" run --rm --no-deps --entrypoint "" \
+            -e DJANGO_ENV=dev \
+            -e DJANGO_SECRET_KEY=test-secret-key \
+            -e DJANGO_DEBUG=true \
+            -e DJANGO_ALLOWED_HOSTS=localhost,127.0.0.1,testserver \
+            -e DATABASE_URL=postgres://chat_backend:chat_backend@db:5432/chat_backend \
+            -e SKIP_RAG_INIT=1 \
+            -e OLLAMA_BASE_URL=http://127.0.0.1:11434 \
+            web uv run python manage.py test
+
+  deploy-beta:
+    needs: docker
+    runs-on: self-hosted
+    env:
+      SERVER_INFRA_ROOT: /home/westfarn/Documents/repos/server-infra
+    steps:
+      - name: Deploy chat_backend beta
+        run: |
+          "$SERVER_INFRA_ROOT/scripts/deploy.sh" \
+            --app chat_backend \
+            --env beta \
+            --ref "${{ gitea.sha }}"
@@ -1,26 +1,49 @@
-name: Deploy Chat Backend
+name: Deploy Prod

-# Runs after Unit Tests completes on master. Direct pushes only (not PRs).
+# Manual prod deploy only (mirrors dta_service / chat_web_app).
+# Push to master deploys beta via Deploy Beta.
 on:
-  workflow_run:
-    workflows: [Unit Tests]
-    types: [completed]
-    branches: [master]
+  workflow_dispatch: {}

 jobs:
+  unit-tests:
+    runs-on: self-hosted
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install uv
+        run: |
+          curl -LsSf https://astral.sh/uv/install.sh | sh
+          echo "$HOME/.local/bin" >> "$GITHUB_PATH"
+
+      - name: Install dependencies
+        run: uv sync --frozen
+
+      - name: Run unit tests
+        env:
+          DJANGO_ENV: dev
+          DJANGO_SECRET_KEY: test-secret-key
+          DJANGO_DEBUG: "true"
+          DJANGO_ALLOWED_HOSTS: localhost,127.0.0.1,testserver
+          DATABASE_URL: ""
+          DB_HOST: ""
+          SKIP_RAG_INIT: "1"
+          OLLAMA_BASE_URL: http://127.0.0.1:11434
+        working-directory: llm_be
+        run: uv run python manage.py test
+
  docker:
-    if: gitea.event.workflow_run.conclusion == 'success' && gitea.event.workflow_run.event == 'push'
+    needs: unit-tests
    runs-on: self-hosted
    steps:
      - name: Checkout
        uses: actions/checkout@v4
-        with:
-          ref: ${{ gitea.event.workflow_run.head_sha }}

      - name: Build Docker image
        run: docker compose build

-      # Ephemeral local Postgres only — never inherit host DATABASE_URL (prod).
+      # Ephemeral local Postgres only — never inherit host DATABASE_URL (prod/beta).
      - name: Run containerized tests
        run: |
          set -euo pipefail
@@ -28,7 +51,7 @@ jobs:
            COMPOSE_DATABASE_URL DJANGO_ENV DJANGO_SECRET_KEY DJANGO_DEBUG \
            DJANGO_ALLOWED_HOSTS OLLAMA_BASE_URL || true

-          PROJECT="chat-backend-ci-${{ gitea.event.workflow_run.head_sha }}"
+          PROJECT="chat-backend-ci-${{ gitea.sha }}"
          cleanup() { docker compose -p "$PROJECT" down -v --remove-orphans || true; }
          trap cleanup EXIT

@@ -43,10 +66,9 @@ jobs:
            -e OLLAMA_BASE_URL=http://127.0.0.1:11434 \
            web uv run python manage.py test

-  deploy:
-    if: gitea.event.workflow_run.conclusion == 'success' && gitea.event.workflow_run.event == 'push'
-    runs-on: self-hosted
+  deploy-prod:
    needs: docker
+    runs-on: self-hosted
    env:
      SERVER_INFRA_ROOT: /home/westfarn/Documents/repos/server-infra
    steps:
@@ -55,4 +77,4 @@ jobs:
          "$SERVER_INFRA_ROOT/scripts/deploy.sh" \
            --app chat_backend \
            --env prod \
-            --ref "${{ gitea.event.workflow_run.head_sha }}"
+            --ref "${{ gitea.sha }}"