From c0bf53101c1c6d55e2281c86cd77a7fb1aabe99b Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 1 Mar 2017 12:10:15 +0000 Subject: [PATCH] Tweaked the release script. - Legacy-Id: 12939 --- bin/mkrelease | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/mkrelease b/bin/mkrelease index f600d30f5..a0adfed7e 100755 --- a/bin/mkrelease +++ b/bin/mkrelease @@ -171,8 +171,9 @@ DEV="$(printf %d.%d.%d.dev0 $MAJOR $MINOR $NEXT)" #cd $DIR ?? note "Updating bower assets ..." -$do ietf/manage.py bower_install > /dev/null -$do svn st ietf/externals/static | grep -v '^\?' +$do ietf/manage.py bower_install > .mkrelease-bower-install.log +$do rm .mkrelease-bower-install.log # This happens at once unless the previous command returns error +$do svn st ietf/externals/static | grep -v '^\?' || true $do svn commit ietf/externals/static -m "Updated bower-managed static web assets" # Get rid of bower-installed files which we don't use: $do rm -rf ietf/externals/static/datatracker/ @@ -180,7 +181,7 @@ $do rm $(svn st ietf/externals/ | grep '^\?' | awk '{print $2}') note "Collecting static files ..." -$do ietf/manage.py collectstatic --noinput --ignore=bower.json --ignore='README.*' | grep -v "Found another file with the destination path" +$do ietf/manage.py collectstatic --noinput --ignore=bower.json --ignore='README.*' --ignore=rev | grep -v "Found another file with the destination path" $do svn commit static/lib/ -m "Updated static files under static/lib/" # note "Checking that there's a recent test-crawler log"