From 74aa281949855228b7b48110be511d59effc6ac2 Mon Sep 17 00:00:00 2001
From: Quinten Steenhuis <qsteenhuis@suffolk.edu>
Date: Fri, 14 Aug 2026 17:59:28 -0400
Subject: [PATCH] Make deploy migrations merge cleanly

---
 .github/workflows/ci.yml                               |  6 +++++-
 .../0011_merge_jurisdiction_accounts_and_workflow.py   | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 efile_app/efile/migrations/0011_merge_jurisdiction_accounts_and_workflow.py

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cecf323..8b2c589 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -72,4 +72,8 @@ jobs:
         env:
           DJANGO_SETTINGS_MODULE: efile.settings
         working-directory: efile_app
-        run: uv run pytest -q
+        run: |
+          # Keep the migration graph deployable. pytest uses --nomigrations, so
+          # the test suite alone would not catch conflicting migration leaves.
+          uv run python manage.py makemigrations --check --dry-run
+          uv run pytest -q
diff --git a/efile_app/efile/migrations/0011_merge_jurisdiction_accounts_and_workflow.py b/efile_app/efile/migrations/0011_merge_jurisdiction_accounts_and_workflow.py
new file mode 100644
index 0000000..9b10a71
--- /dev/null
+++ b/efile_app/efile/migrations/0011_merge_jurisdiction_accounts_and_workflow.py
@@ -0,0 +1,10 @@
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("efile", "0003_jurisdiction_specific_accounts"),
+        ("efile", "0010_merge_amount_in_controversy_and_payment_migrations"),
+    ]
+
+    operations = []