make deploy to staging more robust

Author: jdkent

.github/workflows/deploy-to-staging.yml

@@ -70,9 +70,11 @@ jobs:
 
           # Wait for PostgreSQL to be ready
           until docker compose exec store-pgsql pg_isready; do sleep 5; done
-
-          docker compose exec neurostore flask db migrate
-          docker compose exec neurostore flask db upgrade
+          docker compose exec neurostore bash -c \
+            "flask db merge heads && \
+             flask db stamp head && \
+             flask db migrate && \
+             flask db upgrade"
         '
 
     - name: Run Docker commands in compose directory if changes detected
@@ -87,8 +89,11 @@ jobs:
           # Wait for PostgreSQL to be ready
           until docker compose exec compose_pgsql pg_isready; do sleep 5; done
 
-          docker compose exec compose flask db migrate
-          docker compose exec compose flask db upgrade
+           docker compose exec compose bash -c \
+            "flask db merge heads && \
+             flask db stamp head && \
+             flask db migrate && \
+             flask db upgrade"
         '
 
     - name: Skip Docker commands and run frontend build if only frontend changes detected