Skip to content

Fix deploy migration graph conflict - #151

Merged
nonprofittechy merged 1 commit into
mainfrom
fix/deploy-migrations
Aug 14, 2026
Merged

Fix deploy migration graph conflict#151
nonprofittechy merged 1 commit into
mainfrom
fix/deploy-migrations

Conversation

@nonprofittechy

Copy link
Copy Markdown
Member

What changed

  • Add a no-op merge migration joining the jurisdiction-account migration with the current workflow/payment migration leaf.
  • Check the Django migration graph in CI before running tests.

Why

The Fly release command already runs python manage.py migrate, but deployment was aborting because Django found two migration leaves after PR #143 merged into the newer workflow migrations.

Validation

  • python manage.py makemigrations --check --dry-run
  • python manage.py migrate --plan
  • pytest: 260 passed, 3 skipped
  • Ruff and pre-commit checks passed

@nonprofittechy
nonprofittechy marked this pull request as ready for review August 14, 2026 22:09
@nonprofittechy
nonprofittechy merged commit 70d99f6 into main Aug 14, 2026
4 checks passed
@nonprofittechy
nonprofittechy deleted the fix/deploy-migrations branch August 14, 2026 22:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant