emoji: Build emoji before minifying JS.

Since build_emoji will soon be generated
static/generated/emoji_data.js (containing the emoji data), we need to
generate those JavaScript files before minifying them.
This commit is contained in:
Tim Abbott 2017-01-28 12:12:01 -08:00
parent 5251e4981c
commit f6f8168f4d
1 changed files with 4 additions and 4 deletions

View File

@ -33,15 +33,15 @@ fp = open('var/log/update-prod-static.log', 'w')
# Install node packages # Install node packages
setup_node_modules(npm_args=['--production'], stdout=fp, stderr=fp) setup_node_modules(npm_args=['--production'], stdout=fp, stderr=fp)
# Build emoji
subprocess.check_call(['./tools/setup/emoji/build_emoji'],
stdout=fp, stderr=fp)
# Compile Handlebars templates and minify JavaScript. # Compile Handlebars templates and minify JavaScript.
subprocess.check_call(['./tools/minify-js'] + subprocess.check_call(['./tools/minify-js'] +
(['--prev-deploy', prev_deploy] if prev_deploy else []), (['--prev-deploy', prev_deploy] if prev_deploy else []),
stdout=fp, stderr=fp) stdout=fp, stderr=fp)
# Build emoji
subprocess.check_call(['./tools/setup/emoji/build_emoji'],
stdout=fp, stderr=fp)
# Collect the files that we're going to serve; this creates prod-static/serve. # Collect the files that we're going to serve; this creates prod-static/serve.
subprocess.check_call(['./manage.py', 'collectstatic', '--no-default-ignore', subprocess.check_call(['./manage.py', 'collectstatic', '--no-default-ignore',
'--noinput', '-i', 'assets'], '--noinput', '-i', 'assets'],