From ae0d86868136ad82811352d6b2bc6ab55222b44f Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Thu, 16 Mar 2023 14:06:10 -0400 Subject: [PATCH] make dev-env test pass --- Makefile | 10 ++-------- tools/docker-compose/bootstrap_development.sh | 1 + 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 9f428ce6d0..e3d4d5c1f1 100644 --- a/Makefile +++ b/Makefile @@ -420,7 +420,7 @@ ui-devel: awx/ui/node_modules cp -r awx/ui/build/static/css/* /var/lib/awx/public/static/css; \ cp -r awx/ui/build/static/js/* /var/lib/awx/public/static/js; \ cp -r awx/ui/build/static/media/* /var/lib/awx/public/static/media; \ - fi + fi ui-devel-instrumented: awx/ui/node_modules $(NPM_BIN) --prefix awx/ui --loglevel warn run start-instrumented @@ -655,13 +655,7 @@ help/generate: { lastLine = $$0 }' $(MAKEFILE_LIST) | sort -u @printf "\n" -## Display help for a specific target folder -help/%: - @make -s help MAKEFILE_LIST="$*/Makefile" - +## Display help for ui-next targets help/ui-next: @make -s help MAKEFILE_LIST="awx/ui_next/Makefile" -## Display help for a specific target folder -help/%/aliases: - @make -s help/all MAKEFILE_LIST="$*/Makefile.aliases" diff --git a/tools/docker-compose/bootstrap_development.sh b/tools/docker-compose/bootstrap_development.sh index 1e5736f7b7..c049beeb23 100755 --- a/tools/docker-compose/bootstrap_development.sh +++ b/tools/docker-compose/bootstrap_development.sh @@ -25,6 +25,7 @@ fi # Make sure that the UI static file directory exists, Django complains otherwise. mkdir -p /awx_devel/awx/ui/build/static +mkdir -p /awx_devel/awx/ui_next/build/awx if output=$(awx-manage createsuperuser --noinput --username=admin --email=admin@localhost 2> /dev/null); then echo $output