External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-09 20:19:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix ui-next build step file path issue

Browse Source 
Add full path for the mv command so that the command can be run from ui_next and from project root.

Additionally move the rename of file to src build step.
This commit is contained in:
Hao Liu
2023-08-17 14:08:14 -04:00
committed by Hao Liu
parent a89e266feb
commit d832e75e99
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui_next/Makefile
View File

@@ -25,7 +25,7 @@ $(UI_NEXT_DIR)/build:
@$(MAKE) $(UI_NEXT_DIR)/src/build/awx @$(MAKE) $(UI_NEXT_DIR)/src/build/awx
@echo "=== Copying $(UI_NEXT_DIR)/src/build to $(UI_NEXT_DIR)/build ===" @echo "=== Copying $(UI_NEXT_DIR)/src/build to $(UI_NEXT_DIR)/build ==="
@rm -rf $(UI_NEXT_DIR)/build @rm -rf $(UI_NEXT_DIR)/build
@cp -r $(UI_NEXT_DIR)/src/build $(UI_NEXT_DIR) && mv build/awx/index.html build/awx/index_awx.html @cp -r $(UI_NEXT_DIR)/src/build $(UI_NEXT_DIR)
@echo "=== Done building $(UI_NEXT_DIR)/build ===" @echo "=== Done building $(UI_NEXT_DIR)/build ==="
.PHONY: ui-next/src/build .PHONY: ui-next/src/build
@@ -35,7 +35,8 @@ ui-next/src/build: $(UI_NEXT_DIR)/src/build/awx
## True target for ui-next/src/build. Build ui_next from source. ## True target for ui-next/src/build. Build ui_next from source.
$(UI_NEXT_DIR)/src/build/awx: $(UI_NEXT_DIR)/src $(UI_NEXT_DIR)/src/node_modules/webpack $(UI_NEXT_DIR)/src/build/awx: $(UI_NEXT_DIR)/src $(UI_NEXT_DIR)/src/node_modules/webpack
@echo "=== Building ui_next ===" @echo "=== Building ui_next ==="
@cd $(UI_NEXT_DIR)/src && PRODUCT=$(PRODUCT) PUBLIC_PATH=/static/awx npm run build:awx @cd $(UI_NEXT_DIR)/src && PRODUCT="$(PRODUCT)" PUBLIC_PATH=/static/awx npm run build:awx
@mv $(UI_NEXT_DIR)/src/build/awx/index.html $(UI_NEXT_DIR)/src/build/awx/index_awx.html
.PHONY: ui-next/src .PHONY: ui-next/src
## Clone or link src of UI_NEXT to ui-next/src, will re-clone/link/update if necessary. ## Clone or link src of UI_NEXT to ui-next/src, will re-clone/link/update if necessary.