Compare commits
2
Commits
master
...
8c42f7f54e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8c42f7f54e | ||
|
|
629d337380 |
@@ -23,5 +23,8 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
DJANGO_ENV: dev
|
DJANGO_ENV: dev
|
||||||
DJANGO_SECRET_KEY: test-secret-key
|
DJANGO_SECRET_KEY: test-secret-key
|
||||||
|
# Explicitly clear DB vars so host/prod DATABASE_URL cannot leak in.
|
||||||
|
DATABASE_URL: ""
|
||||||
|
DB_HOST: ""
|
||||||
run: |
|
run: |
|
||||||
uv run python manage.py test
|
uv run python manage.py test
|
||||||
|
|||||||
@@ -20,15 +20,27 @@ jobs:
|
|||||||
- name: Build Docker image
|
- name: Build Docker image
|
||||||
run: docker compose build
|
run: docker compose build
|
||||||
|
|
||||||
|
# Ephemeral local Postgres only — never inherit host DATABASE_URL (prod).
|
||||||
- name: Run containerized tests
|
- name: Run containerized tests
|
||||||
run: |
|
run: |
|
||||||
docker compose up -d db
|
set -euo pipefail
|
||||||
docker compose run --rm --entrypoint "" \
|
# Drop host/prod DB secrets so compose cannot interpolate them.
|
||||||
|
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 || true
|
||||||
|
|
||||||
|
PROJECT="scha-ci-${{ gitea.event.workflow_run.head_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_ENV=dev \
|
||||||
-e DJANGO_SECRET_KEY=test-secret-key \
|
-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://scha:scha@db:5432/scha \
|
-e DATABASE_URL=postgres://scha:scha@db:5432/scha \
|
||||||
web uv run python manage.py test
|
web uv run python manage.py test
|
||||||
docker compose down
|
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
if: gitea.event.workflow_run.conclusion == 'success' && gitea.event.workflow_run.event == 'push'
|
if: gitea.event.workflow_run.conclusion == 'success' && gitea.event.workflow_run.event == 'push'
|
||||||
|
|||||||
@@ -25,5 +25,8 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
DJANGO_ENV: dev
|
DJANGO_ENV: dev
|
||||||
DJANGO_SECRET_KEY: test-secret-key
|
DJANGO_SECRET_KEY: test-secret-key
|
||||||
|
# Explicitly clear DB vars so host/prod DATABASE_URL cannot leak in.
|
||||||
|
DATABASE_URL: ""
|
||||||
|
DB_HOST: ""
|
||||||
run: |
|
run: |
|
||||||
uv run python manage.py test
|
uv run python manage.py test
|
||||||
|
|||||||
@@ -27,7 +27,8 @@ Without `DATABASE_URL` / `DB_HOST`, settings fall back to SQLite (`db.sqlite3`).
|
|||||||
docker compose up --build
|
docker compose up --build
|
||||||
```
|
```
|
||||||
|
|
||||||
App: http://localhost:8000 — Postgres via `DATABASE_URL=postgres://scha:scha@db:5432/scha`.
|
App: http://localhost:8000 — Postgres via bundled `db` (`postgres://scha:scha@db:5432/scha`).
|
||||||
|
Compose does **not** read host `DATABASE_URL` (avoids CI/prod leaks); override with `COMPOSE_DATABASE_URL` if needed.
|
||||||
|
|
||||||
## Environment variables
|
## Environment variables
|
||||||
|
|
||||||
@@ -69,7 +70,7 @@ Validate with:
|
|||||||
|----------|---------|--------|
|
|----------|---------|--------|
|
||||||
| `unittests.yml` | push + PR → `master` | `uv sync` + `manage.py test` |
|
| `unittests.yml` | push + PR → `master` | `uv sync` + `manage.py test` |
|
||||||
| `ci.yml` | PR → `master` | same unit tests |
|
| `ci.yml` | PR → `master` | same unit tests |
|
||||||
| `deploy.yml` | after Unit Tests succeeds on `master` **push** | docker build/test → `deploy.sh` |
|
| `deploy.yml` | after Unit Tests succeeds on `master` **push** | docker build + tests on **ephemeral compose Postgres** → `deploy.sh` |
|
||||||
|
|
||||||
Deploy never runs on PRs.
|
Deploy never runs on PRs.
|
||||||
|
|
||||||
|
|||||||
+5
-1
@@ -20,12 +20,16 @@ services:
|
|||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
# No required env_file — CI has no .env. Defaults below; for local secrets:
|
# No required env_file — CI has no .env. Defaults below; for local secrets:
|
||||||
# docker compose --env-file .env up
|
# docker compose --env-file .env up
|
||||||
|
#
|
||||||
|
# Do NOT interpolate ${DATABASE_URL} here. On the Act runner / control node that
|
||||||
|
# var often points at shared prod/beta Postgres; compose would bake it into
|
||||||
|
# containerized tests. Use COMPOSE_DATABASE_URL only if you need to override.
|
||||||
environment:
|
environment:
|
||||||
DJANGO_ENV: ${DJANGO_ENV:-dev}
|
DJANGO_ENV: ${DJANGO_ENV:-dev}
|
||||||
DJANGO_SECRET_KEY: ${DJANGO_SECRET_KEY:-dev-only-change-me}
|
DJANGO_SECRET_KEY: ${DJANGO_SECRET_KEY:-dev-only-change-me}
|
||||||
DJANGO_DEBUG: ${DJANGO_DEBUG:-true}
|
DJANGO_DEBUG: ${DJANGO_DEBUG:-true}
|
||||||
DJANGO_ALLOWED_HOSTS: ${DJANGO_ALLOWED_HOSTS:-localhost,127.0.0.1,0.0.0.0}
|
DJANGO_ALLOWED_HOSTS: ${DJANGO_ALLOWED_HOSTS:-localhost,127.0.0.1,0.0.0.0}
|
||||||
DATABASE_URL: ${DATABASE_URL:-postgres://scha:scha@db:5432/scha}
|
DATABASE_URL: ${COMPOSE_DATABASE_URL:-postgres://scha:scha@db:5432/scha}
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|||||||
@@ -0,0 +1,64 @@
|
|||||||
|
# Generated by Django 5.2.16 on 2026-07-14 12:06
|
||||||
|
|
||||||
|
import datetime
|
||||||
|
import django.db.models.deletion
|
||||||
|
import django.utils.timezone
|
||||||
|
from django.conf import settings
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('schasite', '0010_communityparks_communitypost_communityschools_and_more'),
|
||||||
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='payments',
|
||||||
|
name='date',
|
||||||
|
field=models.DateField(default=datetime.datetime(2026, 7, 14, 12, 6, 52, 688298, tzinfo=datetime.timezone.utc)),
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='CommunityMember',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('created', models.DateTimeField(default=django.utils.timezone.now)),
|
||||||
|
('last_modified', models.DateTimeField(default=django.utils.timezone.now)),
|
||||||
|
('membership_person', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='schasite.membershipperson')),
|
||||||
|
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'abstract': False,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='communitycomment',
|
||||||
|
name='author',
|
||||||
|
field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='schasite.communitymember'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='communitypost',
|
||||||
|
name='author',
|
||||||
|
field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='schasite.communitymember'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='communitypostreports',
|
||||||
|
name='reporter',
|
||||||
|
field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='schasite.communitymember'),
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='CommunityPostLikes',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('created', models.DateTimeField(default=django.utils.timezone.now)),
|
||||||
|
('last_modified', models.DateTimeField(default=django.utils.timezone.now)),
|
||||||
|
('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='schasite.communitypost')),
|
||||||
|
('reporter', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='schasite.communitymember')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'abstract': False,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
]
|
||||||
+3
-3
@@ -194,12 +194,12 @@ class CommunityPost(TimeInfoBase):
|
|||||||
category = models.CharField(max_length=255)
|
category = models.CharField(max_length=255)
|
||||||
content = models.CharField(max_length=1024*8)
|
content = models.CharField(max_length=1024*8)
|
||||||
likes = models.IntegerField(default=0)
|
likes = models.IntegerField(default=0)
|
||||||
author = models.OneToOneField(CommunityMember, on_delete=models.CASCADE)
|
author = models.OneToOneField(CommunityMember, on_delete=models.CASCADE, blank=True, null=True)
|
||||||
|
|
||||||
class CommunityPostReports(TimeInfoBase):
|
class CommunityPostReports(TimeInfoBase):
|
||||||
# for anyone who reports a post
|
# for anyone who reports a post
|
||||||
post = models.ForeignKey(CommunityPost, on_delete=models.CASCADE)
|
post = models.ForeignKey(CommunityPost, on_delete=models.CASCADE)
|
||||||
reporter = models.OneToOneField(CommunityMember, on_delete=models.CASCADE)
|
reporter = models.OneToOneField(CommunityMember, on_delete=models.CASCADE, blank=True, null=True)
|
||||||
|
|
||||||
class CommunityPostLikes(TimeInfoBase):
|
class CommunityPostLikes(TimeInfoBase):
|
||||||
# for anyone who likes a post
|
# for anyone who likes a post
|
||||||
@@ -210,4 +210,4 @@ class CommunityComment(TimeInfoBase):
|
|||||||
post = models.ForeignKey(CommunityPost, on_delete=models.CASCADE)
|
post = models.ForeignKey(CommunityPost, on_delete=models.CASCADE)
|
||||||
content = models.CharField(max_length=1024*8)
|
content = models.CharField(max_length=1024*8)
|
||||||
likes = models.IntegerField(default=0)
|
likes = models.IntegerField(default=0)
|
||||||
author = models.OneToOneField(CommunityMember, on_delete=models.CASCADE)
|
author = models.OneToOneField(CommunityMember, on_delete=models.CASCADE, blank=True, null=True)
|
||||||
Reference in New Issue
Block a user