Skip to content

Commit

Permalink
Merge pull request #7676 from ietf-tools/main
Browse files Browse the repository at this point in the history
ci: merge main to release
  • Loading branch information
rjsparks authored Jul 11, 2024
2 parents 03cfe52 + 2bfb700 commit 5697205
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions dev/build/celery-start.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/bin/bash
#!/bin/bash -e
#
# Run a celery worker
#
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
Expand Down
6 changes: 3 additions & 3 deletions dev/build/datatracker-start.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash
#!/bin/bash -e

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
Expand Down
4 changes: 2 additions & 2 deletions dev/build/migration-start.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#!/bin/bash -e

echo "Running Datatracker migrations..."
./ietf/manage.py migrate --skip-checks --settings=settings_local
./ietf/manage.py migrate --settings=settings_local

echo "Done!"

0 comments on commit 5697205

Please sign in to comment.