From 4bb1cec337bc13ce25937c538bcb84e94f94f7d6 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 16 Jun 2019 14:21:52 +0000 Subject: [PATCH] Improved support for the mixed-release switch in bin/mkrelease. - Legacy-Id: 16270 --- bin/mkrelease | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/mkrelease b/bin/mkrelease index 98508f757..9c2192155 100755 --- a/bin/mkrelease +++ b/bin/mkrelease @@ -225,13 +225,13 @@ note "Upgrading the python library modules before checking migrations and runnin $do pip install --upgrade -r requirements.txt note "Checking that all model changes have been captured in migrations ..." -$do ietf/manage.py makemigrations | tee /dev/stderr | grep -q "^No changes detected$" || die "Model changes without migrations found." +$do ietf/manage.py makemigrations | tee /dev/stderr | $do grep -q "^No changes detected$" || die "Model changes without migrations found." note "Making sure all migrations have been run ..." $do ietf/manage.py migrate note "Running the tests suite and writing release coverage data ..." -$do ietf/manage.py test --settings=ietf.settings_releasetest --save-version-coverage=$VER +$do ietf/manage.py test --settings=ietf.settings_releasetest --save-version-coverage=$VER ${PERMIT_MIGR_MIX:+"--permit-mixed-migrations"} note "Committing the release coverage data ..." $do svn commit release-coverage.json.gz -m "Code coverage data for release $VER"