From e3a8b5813ee0a9543129497600a60cb509a8937a Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Thu, 11 Jul 2024 11:24:48 -0300 Subject: [PATCH 1/2] ci: run checks when migrating --- dev/build/celery-start.sh | 4 ++-- dev/build/datatracker-start.sh | 4 ++-- dev/build/migration-start.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/build/celery-start.sh b/dev/build/celery-start.sh index d0dda4b2377..dd7323591ad 100644 --- a/dev/build/celery-start.sh +++ b/dev/build/celery-start.sh @@ -5,10 +5,10 @@ echo "Running Datatracker checks..." ./ietf/manage.py check -if ! ietf/manage.py migrate --skip-checks --check ; then +if ! ietf/manage.py migrate --check ; then echo "Unapplied migrations found, waiting to start..." sleep 5 - while ! ietf/manage.py migrate --skip-checks --check ; do + while ! ietf/manage.py migrate --check ; do echo "... still waiting for migrations..." sleep 5 done diff --git a/dev/build/datatracker-start.sh b/dev/build/datatracker-start.sh index 85017dc5485..a06895504fb 100644 --- a/dev/build/datatracker-start.sh +++ b/dev/build/datatracker-start.sh @@ -3,10 +3,10 @@ echo "Running Datatracker checks..." ./ietf/manage.py check -if ! ietf/manage.py migrate --skip-checks --check ; then +if ! ietf/manage.py migrate --check ; then echo "Unapplied migrations found, waiting to start..." sleep 5 - while ! ietf/manage.py migrate --skip-checks --check ; do + while ! ietf/manage.py migrate --check ; do echo "... still waiting for migrations..." sleep 5 done diff --git a/dev/build/migration-start.sh b/dev/build/migration-start.sh index d3505f3b205..eca49440c1d 100644 --- a/dev/build/migration-start.sh +++ b/dev/build/migration-start.sh @@ -1,6 +1,6 @@ #!/bin/bash echo "Running Datatracker migrations..." -./ietf/manage.py migrate --skip-checks --settings=settings_local +./ietf/manage.py migrate --settings=settings_local echo "Done!" From e73daf1853e7d872f1fe1a1cba717a2f71106ead Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Thu, 11 Jul 2024 12:17:33 -0300 Subject: [PATCH 2/2] ci: don't start if checks fail --- dev/build/celery-start.sh | 2 +- dev/build/datatracker-start.sh | 2 +- dev/build/migration-start.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/build/celery-start.sh b/dev/build/celery-start.sh index dd7323591ad..f6284e84dbe 100644 --- a/dev/build/celery-start.sh +++ b/dev/build/celery-start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e # # Run a celery worker # diff --git a/dev/build/datatracker-start.sh b/dev/build/datatracker-start.sh index a06895504fb..5eb99c4745e 100644 --- a/dev/build/datatracker-start.sh +++ b/dev/build/datatracker-start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e echo "Running Datatracker checks..." ./ietf/manage.py check diff --git a/dev/build/migration-start.sh b/dev/build/migration-start.sh index eca49440c1d..211638aec64 100644 --- a/dev/build/migration-start.sh +++ b/dev/build/migration-start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e echo "Running Datatracker migrations..." ./ietf/manage.py migrate --settings=settings_local