From ef27ebfed8d37fd6c251daeb8f8765e52bb8ca37 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Tue, 24 Nov 2020 13:58:19 -0500 Subject: [PATCH] Remove *-next make targets --- Makefile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 28e155a64a..ff523d7bf4 100644 --- a/Makefile +++ b/Makefile @@ -460,13 +460,17 @@ else endif -# UI NEXT TASKS +# UI TASKS # -------------------------------------- awx/ui_next/node_modules: $(NPM_BIN) --prefix awx/ui_next install -ui-release: ui-devel +clean-ui: + rm -rf node_modules + rm -rf awx/ui_next/node_modules + rm -rf awx/ui_next/build +ui-release: ui-devel ui-devel: awx/ui_next/node_modules $(NPM_BIN) --prefix awx/ui_next run extract-strings $(NPM_BIN) --prefix awx/ui_next run compile-strings @@ -478,18 +482,13 @@ ui-devel: awx/ui_next/node_modules cp -r awx/ui_next/build/static/js/* awx/public/static/js cp -r awx/ui_next/build/static/media/* awx/public/static/media -clean-ui: - rm -rf node_modules - rm -rf awx/ui_next/node_modules - rm -rf awx/ui_next/build - -ui-zuul-lint-and-test: ui-next-zuul-lint-and-test -ui-next-zuul-lint-and-test: +ui-zuul-lint-and-test: $(NPM_BIN) --prefix awx/ui_next install $(NPM_BIN) run --prefix awx/ui_next lint $(NPM_BIN) run --prefix awx/ui_next prettier-check $(NPM_BIN) run --prefix awx/ui_next test + # Build a pip-installable package into dist/ with a timestamped version number. dev_build: $(PYTHON) setup.py dev_build @@ -501,7 +500,7 @@ release_build: dist/$(SDIST_TAR_FILE): ui-release VERSION $(PYTHON) setup.py $(SDIST_COMMAND) -dist/$(WHEEL_FILE): ui-release-next +dist/$(WHEEL_FILE): ui-release $(PYTHON) setup.py $(WHEEL_COMMAND) sdist: dist/$(SDIST_TAR_FILE)