From bc06a9d91ff34644e17fdaa21fa447c548ffa503 Mon Sep 17 00:00:00 2001 From: imperosol Date: Fri, 20 Nov 2026 09:28:47 +0100 Subject: [PATCH 1/2] fix: add missing migrations --- ...lter_user_email_alter_user_second_email.py | 29 +++++++++++++++++++ timetable/migrations/0001_initial.py | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 core/migrations/0053_alter_user_email_alter_user_second_email.py diff --git a/core/migrations/0053_alter_user_email_alter_user_second_email.py b/core/migrations/0053_alter_user_email_alter_user_second_email.py new file mode 100644 index 00000000..709b01a8 --- /dev/null +++ b/core/migrations/0053_alter_user_email_alter_user_second_email.py @@ -0,0 +1,29 @@ +# Generated by Django 5.2.18 on 2026-11-15 11:46 + +from django.db import migrations + +import antispam.models.fields + + +class Migration(migrations.Migration): + dependencies = [("core", "0052_preferences_show_my_timetable")] + + operations = [ + migrations.AlterField( + model_name="user", + name="email", + field=antispam.models.fields.AntiSpamEmailField( + max_length=254, unique=True, verbose_name="email address" + ), + ), + migrations.AlterField( + model_name="user", + name="second_email", + field=antispam.models.fields.AntiSpamEmailField( + blank=True, + max_length=254, + null=True, + verbose_name="second email address", + ), + ), + ] diff --git a/timetable/migrations/0001_initial.py b/timetable/migrations/0001_initial.py index a1edeb5a..ee3abff5 100644 --- a/timetable/migrations/0001_initial.py +++ b/timetable/migrations/0001_initial.py @@ -104,7 +104,7 @@ class Migration(migrations.Migration): "week_group", models.CharField( blank=True, - choices=[("A", "A"), ("B", "B")], + choices=[("A", "A"), ("B", "B"), ("", "Both")], default="", max_length=1, verbose_name="week group", From 342beb6c9bd4425a27a1e8b7dbbf3a90e213fa29 Mon Sep 17 00:00:00 2001 From: imperosol Date: Fri, 20 Nov 2026 09:54:23 +0100 Subject: [PATCH 2/2] check in CI that no migration is missing --- .github/actions/setup_project/action.yml | 3 --- .github/workflows/ci.yml | 11 +++++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup_project/action.yml b/.github/actions/setup_project/action.yml index 720d36bc..74f2b9ad 100644 --- a/.github/actions/setup_project/action.yml +++ b/.github/actions/setup_project/action.yml @@ -18,10 +18,7 @@ runs: version: 1.0 # increment to reset cache - name: Install Redis - if: ${{ inputs.full == 'true' }} uses: shogo82148/actions-setup-redis@v1 - with: - redis-version: "7.x" - name: "Set up Python" uses: actions/setup-python@v6 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e92bf82e..766ffec1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,17 @@ jobs: with: extra_args: --all-files + migration-check: + name: Check missing migrations + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6 + - uses: ./.github/actions/setup_project + with: + full: false + - name: check migrations + run: uv run ./manage.py makemigrations --check + tests: name: Run tests and generate coverage report runs-on: ubuntu-latest