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

[YUNIKORN-2054] Shim: Fix Makefile dependencies #717

Closed
wants to merge 1 commit into from
Closed

[YUNIKORN-2054] Shim: Fix Makefile dependencies #717

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
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ run_plugin: build_plugin
.PHONY: build
build: $(DEV_BIN_DIR)/$(SCHEDULER_BINARY)

$(DEV_BIN_DIR)/$(SCHEDULER_BINARY): go.mod go.sum pkg
$(DEV_BIN_DIR)/$(SCHEDULER_BINARY): go.mod go.sum $(shell find pkg)
@echo "building scheduler binary"
@mkdir -p "$(DEV_BIN_DIR)"
"$(GO)" build \
Expand All @@ -315,7 +315,7 @@ $(DEV_BIN_DIR)/$(SCHEDULER_BINARY): go.mod go.sum pkg
.PHONY: build_plugin
build_plugin: $(DEV_BIN_DIR)/$(PLUGIN_BINARY)

$(DEV_BIN_DIR)/$(PLUGIN_BINARY): go.mod go.sum pkg
$(DEV_BIN_DIR)/$(PLUGIN_BINARY): go.mod go.sum $(shell find pkg)
@echo "building scheduler plugin binary"
@mkdir -p "$(DEV_BIN_DIR)"
"$(GO)" build \
Expand All @@ -328,7 +328,7 @@ $(DEV_BIN_DIR)/$(PLUGIN_BINARY): go.mod go.sum pkg
.PHONY: scheduler
scheduler: $(RELEASE_BIN_DIR)/$(SCHEDULER_BINARY)

$(RELEASE_BIN_DIR)/$(SCHEDULER_BINARY): go.mod go.sum pkg
$(RELEASE_BIN_DIR)/$(SCHEDULER_BINARY): go.mod go.sum $(shell findepkg)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo in the findepkg

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will fix on commit, no need to update the patch

@echo "building binary for scheduler docker image"
@mkdir -p "$(RELEASE_BIN_DIR)"
CGO_ENABLED=0 GOOS=linux GOARCH="${EXEC_ARCH}" "$(GO)" build \
Expand All @@ -344,7 +344,7 @@ $(RELEASE_BIN_DIR)/$(SCHEDULER_BINARY): go.mod go.sum pkg
.PHONY: plugin
plugin: $(RELEASE_BIN_DIR)/$(PLUGIN_BINARY)

$(RELEASE_BIN_DIR)/$(PLUGIN_BINARY): go.mod go.sum pkg
$(RELEASE_BIN_DIR)/$(PLUGIN_BINARY): go.mod go.sum $(shell find pkg)
@echo "building binary for plugin docker image"
@mkdir -p "$(RELEASE_BIN_DIR)"
CGO_ENABLED=0 GOOS=linux GOARCH="${EXEC_ARCH}" "$(GO)" build \
Expand Down Expand Up @@ -399,7 +399,7 @@ plugin_image: plugin docker/plugin conf/scheduler-config.yaml
.PHONY: admission
admission: $(RELEASE_BIN_DIR)/$(ADMISSION_CONTROLLER_BINARY)

$(RELEASE_BIN_DIR)/$(ADMISSION_CONTROLLER_BINARY): go.mod go.sum pkg
$(RELEASE_BIN_DIR)/$(ADMISSION_CONTROLLER_BINARY): go.mod go.sum $(shell find pkg)
@echo "building admission controller binary"
@mkdir -p "$(RELEASE_BIN_DIR)"
CGO_ENABLED=0 GOOS=linux GOARCH="${EXEC_ARCH}" "$(GO)" build \
Expand Down Expand Up @@ -451,7 +451,7 @@ webtest_image: build_web_test_server_prod docker/webtest
.PHONY: build_web_test_server_dev
build_web_test_server_dev: $(DEV_BIN_DIR)/$(TEST_SERVER_BINARY)

$(DEV_BIN_DIR)/$(TEST_SERVER_BINARY): go.mod go.sum pkg
$(DEV_BIN_DIR)/$(TEST_SERVER_BINARY): go.mod go.sum $(shell find pkg)
@echo "building local web server binary"
"$(GO)" build \
-o="$(DEV_BIN_DIR)/$(TEST_SERVER_BINARY)" \
Expand All @@ -462,7 +462,7 @@ $(DEV_BIN_DIR)/$(TEST_SERVER_BINARY): go.mod go.sum pkg
.PHONY: build_web_test_server_prod
build_web_test_server_prod: $(RELEASE_BIN_DIR)/$(TEST_SERVER_BINARY)

$(RELEASE_BIN_DIR)/$(TEST_SERVER_BINARY): go.mod go.sum pkg
$(RELEASE_BIN_DIR)/$(TEST_SERVER_BINARY): go.mod go.sum $(shell find pkg)
@echo "building web server binary"
CGO_ENABLED=0 GOOS=linux GOARCH="${EXEC_ARCH}" "$(GO)" build \
-a \
Expand Down