Added an --ignore-resources switch to bin/mkrelease, as a stopgap measure before moving to yarn.

- Legacy-Id: 16717
This commit is contained in:
Henrik Levkowetz 2019-09-08 14:58:17 +00:00
parent 3336f4a11b
commit eafaa0d742

View file

@ -79,8 +79,8 @@ trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)";
# Option parsing # Option parsing
# Options # Options
shortopts=hmnpvV shortopts=hmnipvV
longopts=help,message,dry-run,permit-migr-mix,verbose,version longopts=help,message,dry-run,ignore-resources,permit-migr-mix,verbose,version
# Default values # Default values
MSG="" MSG=""
@ -88,6 +88,7 @@ PROJ=ietfdb
VERFILE=ietf/__init__.py VERFILE=ietf/__init__.py
SETTINGS=ietf/settings.py SETTINGS=ietf/settings.py
PERMIT_MIGR_MIX="" PERMIT_MIGR_MIX=""
IGNORE_RESOURCES=""
do="" do=""
if [ "$(uname)" = "Linux" ]; then if [ "$(uname)" = "Linux" ]; then
@ -108,6 +109,7 @@ while true ; do
-h| --help) usage; exit;; # Show this help, then exit -h| --help) usage; exit;; # Show this help, then exit
-m| --message) MSG=$2; shift;; # Specify a commit message -m| --message) MSG=$2; shift;; # Specify a commit message
-n| --dry-run) do="echo ==>";; # Show what would be done -n| --dry-run) do="echo ==>";; # Show what would be done
-i| --ignore-resources) IGNORE_RESOURCES=1;; # Don't try to update resources
-p| --permit-migr-mix) PERMIT_MIGR_MIX=1;; # Permit mixed schema and data migrations -p| --permit-migr-mix) PERMIT_MIGR_MIX=1;; # Permit mixed schema and data migrations
-v| --verbose) VERBOSE=1;; # Be more talkative -v| --verbose) VERBOSE=1;; # Be more talkative
-V| --version) version; exit;; # Show program version, then exit -V| --version) version; exit;; # Show program version, then exit
@ -202,15 +204,16 @@ if [ -z "$PERMIT_MIGR_MIX" ]; then
fi fi
fi fi
note "Updating bower assets ..." if [ -z "$IGNORE_RESOURCES" ]; then
$do ietf/manage.py bower_install > .mkrelease-bower-install.log note "Updating bower assets ..."
$do rm .mkrelease-bower-install.log # This happens at once unless the previous command returns error $do ietf/manage.py bower_install > .mkrelease-bower-install.log
$do svn st ietf/externals/static | grep -v '^\?' || true $do rm .mkrelease-bower-install.log # This happens at once unless the previous command returns error
$do svn commit ietf/externals/static -m "Updated bower-managed static web assets" $do svn st ietf/externals/static | grep -v '^\?' || true
# Get rid of bower-installed files which we don't use: $do svn commit ietf/externals/static -m "Updated bower-managed static web assets"
$do rm -rf ietf/externals/static/datatracker/ # Get rid of bower-installed files which we don't use:
$do rm $(svn st ietf/externals/ | grep '^\?' | awk '{print $2}') $do rm -rf ietf/externals/static/datatracker/
$do rm -f $(svn st ietf/externals/ | grep '^\?' | awk '{print $2}')
fi
note "Collecting static files ..." note "Collecting static files ..."
$do ietf/manage.py collectstatic --noinput --ignore=bower.json --ignore='README.*' --ignore=rev | 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"