From 225c3d6a395bb533ab9623dfd0219c79a99f8d05 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Tue, 22 Dec 2020 14:05:03 -0500 Subject: [PATCH] Speed up subsequent invocations of ui-devel / ui-release --- .gitignore | 1 + Makefile | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 71dd7966fa..573befb33d 100644 --- a/.gitignore +++ b/.gitignore @@ -147,3 +147,4 @@ use_dev_supervisor.txt *.unison.tmp *.# /tools/docker-compose/overrides/ +/awx/ui_next/.ui-built diff --git a/Makefile b/Makefile index db938905ef..ef7fd54614 100644 --- a/Makefile +++ b/Makefile @@ -462,18 +462,21 @@ endif # UI TASKS # -------------------------------------- -awx/ui_next/node_modules: - $(NPM_BIN) --prefix awx/ui_next --loglevel warn --ignore-scripts install - clean-ui: rm -rf node_modules rm -rf awx/ui_next/node_modules rm -rf awx/ui_next/build rm -rf awx/ui_next/src/locales/_build + rm -rf awx/ui_next/.ui-built git checkout awx/ui_next/src/locales ui-release: ui-devel -ui-devel: awx/ui_next/node_modules +ui-devel: awx/ui_next/node_modules awx/ui_next/.ui-built + +awx/ui_next/node_modules: + $(NPM_BIN) --prefix awx/ui_next --loglevel warn --ignore-scripts install + +awx/ui_next/.ui-built: $(NPM_BIN) --prefix awx/ui_next --loglevel warn run extract-strings $(NPM_BIN) --prefix awx/ui_next --loglevel warn run compile-strings $(NPM_BIN) --prefix awx/ui_next --loglevel warn run build @@ -484,6 +487,7 @@ ui-devel: awx/ui_next/node_modules cp -r awx/ui_next/build/static/css/* awx/public/static/css cp -r awx/ui_next/build/static/js/* awx/public/static/js cp -r awx/ui_next/build/static/media/* awx/public/static/media + touch $@ ui-zuul-lint-and-test: $(NPM_BIN) --prefix awx/ui_next install