Point CI and deploy at app_catalog.print_forge on master.

Gitea was still targeting main and a leftover client-ci compose name, so PRs and server-infra --app print_forge would miss each other.
This commit is contained in:
2026-09-06 20:31:42 -05:00
parent 9f2d349974
commit 5ea7cce56b
5 changed files with 9 additions and 5 deletions
+1 -1
View File
@@ -2,7 +2,7 @@ name: CI
on:
pull_request:
branches: [main]
branches: [master]
jobs:
test:
+2 -1
View File
@@ -45,7 +45,7 @@ jobs:
COMPOSE_DATABASE_URL DJANGO_ENV DJANGO_SECRET_KEY DJANGO_DEBUG \
DJANGO_ALLOWED_HOSTS || true
PROJECT="client-ci-${{ gitea.sha }}"
PROJECT="print-forge-ci-${{ gitea.sha }}"
cleanup() { docker compose -p "$PROJECT" down -v --remove-orphans || true; }
trap cleanup EXIT
@@ -66,6 +66,7 @@ jobs:
SERVER_INFRA_ROOT: /home/westfarn/Documents/repos/server-infra
ANSIBLE_PRIVATE_KEY_FILE: /home/westfarn/.ssh/ansible_deploy
steps:
# --app must match server-infra app_catalog (print_forge).
- name: Deploy print_forge beta to all webservers
run: |
"$SERVER_INFRA_ROOT/scripts/deploy.sh" \
+2 -1
View File
@@ -43,7 +43,7 @@ jobs:
COMPOSE_DATABASE_URL DJANGO_ENV DJANGO_SECRET_KEY DJANGO_DEBUG \
DJANGO_ALLOWED_HOSTS || true
PROJECT="client-ci-${{ gitea.sha }}"
PROJECT="print-forge-ci-${{ gitea.sha }}"
cleanup() { docker compose -p "$PROJECT" down -v --remove-orphans || true; }
trap cleanup EXIT
@@ -64,6 +64,7 @@ jobs:
SERVER_INFRA_ROOT: /home/westfarn/Documents/repos/server-infra
ANSIBLE_PRIVATE_KEY_FILE: /home/westfarn/.ssh/ansible_deploy
steps:
# --app must match server-infra app_catalog (print_forge).
- name: Deploy print_forge prod to all webservers
run: |
"$SERVER_INFRA_ROOT/scripts/deploy.sh" \
+3 -1
View File
@@ -45,7 +45,9 @@ cp .env.prod.example ~/Documents/secrets/print_forge/print_forge_prod.env
./scripts/validate-env.sh ~/Documents/secrets/print_forge/print_forge_prod.env
```
Infra: Postgres on 10.0.0.230, server-infra app_catalog, NPM, CI.
Infra: Postgres on 10.0.0.230, server-infra `app_catalog.print_forge`, NPM, CI.
Gitea deploy calls `deploy.sh --app print_forge` (must match that catalog key).
Secrets: `~/Documents/secrets/print_forge/print_forge_{prod,beta}.env`.
Create a portal user with `createsuperuser` after first deploy.
## Stack
+1 -1
View File
@@ -128,7 +128,7 @@ done
if ((${#missing[@]} > 0)); then
echo "Missing required environment variables in $ENV_FILE:" >&2
printf ' - %s\n' "${missing[@]}" >&2
echo "Copy .env.prod.example to ~/Documents/secrets/<slug>_site/<slug>_site_${DJANGO_ENV}.env and set values." >&2
echo "Copy .env.prod.example to ~/Documents/secrets/print_forge/print_forge_${DJANGO_ENV}.env and set values." >&2
exit 1
fi