Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix headless awx build #13744

Closed
wants to merge 1 commit into from
Closed

fix headless awx build #13744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ ui-test-general:
# NOTE: The make target ui-next is imported from awx/ui_next/Makefile
HEADLESS ?= no
ifeq ($(HEADLESS), yes)
dist/$(SDIST_TAR_FILE):
dist/$(SDIST_TAR_FILE): ui-next/headless
else
dist/$(SDIST_TAR_FILE): $(UI_BUILD_FLAG_FILE) ui-next
endif
Expand Down
19 changes: 10 additions & 9 deletions awx/ui_next/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@ ui-next: ui-next/build

.PHONY: ui-next/build
## Build ui-next/build
ui-next/build: $(UI_NEXT_DIR)/build

## True build target for ui-next.
$(UI_NEXT_DIR)/build:
@$(MAKE) $(UI_NEXT_DIR)/src/build/awx
@echo "=== Copying $(UI_NEXT_DIR)/src/build to $(UI_NEXT_DIR)/build ==="
@rm -rf $(UI_NEXT_DIR)/build
@cp -r $(UI_NEXT_DIR)/src/build $(UI_NEXT_DIR)
@echo "=== Done building $(UI_NEXT_DIR)/build ==="
ui-next: $(UI_NEXT_DIR)/build

.PHONY: ui-next/headless
## Create empty ui-next/build for headless builds
ui-next/headless:
@echo "=== Creating empty $(UI_NEXT_DIR)/build ==="
@rm -rf $(UI_NEXT_DIR)/build/awx
@mkdir -p $(UI_NEXT_DIR)/build/awx
@touch $(UI_NEXT_DIR)/build/awx/HEADLESS
@echo "=== Done creating empty $(UI_NEXT_DIR)/build ==="

.PHONY: ui-next/src/build
## Build ui-next/src/build
Expand Down