merge for ci

e-dialect · Nov 16, 2023 · e0c31fb · e0c31fb
1 parent 4ec744c
commit e0c31fb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Start django service
         run: |
           cd hinghwa-dict-backend
-          python3 manage.py makemigrations
+          python3 manage.py makemigrations --merge --no-input
           python3 manage.py migrate
           DJANGO_SUPERUSER_PASSWORD=testtest123 python manage.py createsuperuser --username admin --email [email protected] --no-input
           DJANGO_SUPERUSER_PASSWORD=testtest222 python manage.py createsuperuser --username admin2 --email [email protected] --no-input