diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7a03827e..73c867439 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -129,8 +129,10 @@ jobs: echo "Running checks..." ./ietf/manage.py check echo "Validating migrations..." - if ! (ietf/manage.py makemigrations 2>&1 | grep -q "^No changes detected$") ; then + MSG=$(ietf/manage.py makemigrations 2>&1) + if ! ( echo ${MSG} | grep -q "^No changes detected$") ; then echo "Model changes without migrations found." + echo ${MSG} exit 1 fi echo "Running tests..." diff --git a/.github/workflows/ci-run-tests.yml b/.github/workflows/ci-run-tests.yml index dc5955d88..35521b597 100644 --- a/.github/workflows/ci-run-tests.yml +++ b/.github/workflows/ci-run-tests.yml @@ -41,8 +41,10 @@ jobs: echo "Running checks..." ./ietf/manage.py check echo "Validating migrations..." - if ! (ietf/manage.py makemigrations 2>&1 | grep -q "^No changes detected$") ; then + MSG=$(ietf/manage.py makemigrations 2>&1) + if ! ( echo ${MSG} | grep -q "^No changes detected$") ; then echo "Model changes without migrations found." + echo ${MSG} exit 1 fi echo "Running tests..." diff --git a/dev/INSTALL b/dev/INSTALL index 0c44db5bd..0d0616fa7 100644 --- a/dev/INSTALL +++ b/dev/INSTALL @@ -6,8 +6,6 @@ Installation Instructions ------------------------------------------------------------------------------ - - General Instructions for Deployment of a New Release ==================================================== diff --git a/ietf/settings_releasetest.py b/ietf/settings_releasetest.py deleted file mode 100644 index dfc7971a5..000000000 --- a/ietf/settings_releasetest.py +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright The IETF Trust 2015-2020, All Rights Reserved -# -*- coding: utf-8 -*- - - -# Standard settings except we use SQLite, this is useful for speeding -# up tests that depend on the test database, try for instance: -# -# ./manage.py test --settings=settings_sqlitetest doc.ChangeStateTestCase -# - -from .settings import * # pyflakes:ignore - -# Workaround to avoid spending minutes stepping through the migrations in -# every test run. The result of this is to use the 'syncdb' way of creating -# the test database instead of doing it through the migrations. Taken from -# https://gist.github.com/NotSqrt/5f3c76cd15e40ef62d09 - -class DisableMigrations(object): - - def __contains__(self, item): - return True - - def __getitem__(self, item): - return None - -MIGRATION_MODULES = DisableMigrations() - -DATABASES = { - 'default': { - 'NAME': 'test.db', - 'ENGINE': 'django.db.backends.sqlite3', - }, - } - -if TEST_CODE_COVERAGE_CHECKER and not TEST_CODE_COVERAGE_CHECKER._started: # pyflakes:ignore - TEST_CODE_COVERAGE_CHECKER.start() # pyflakes:ignore - -MEDIA_ROOT = os.path.join(os.path.dirname(BASE_DIR), 'test/media/') # pyflakes:ignore -MEDIA_URL = '/test/media/' -PHOTOS_DIR = MEDIA_ROOT + PHOTOS_DIRNAME # pyflakes:ignore - -REQUEST_PROFILE_STORE_ANONYMOUS_SESSIONS = False -