Skip to content

Commit

Permalink
[#849] Move Makefiles to scripts directory
Browse files Browse the repository at this point in the history
Moved the Makefiles from various directories to the scripts directory
for better organization and consistency. Renamed the Makefiles
accordingly and updated the references within other files to use the new
paths in the scripts directory. This restructuring helps in streamlining
the build processes and eases maintenance tasks related to the make
files.
  • Loading branch information
placek committed Apr 24, 2024
1 parent 8dcbfcc commit c780dd8
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
common_mk := ../../scripts/govtool/common.mk
common_mk := common.mk
ifeq ($(origin $(common_mk)), undefined)
$(eval $(common_mk) := included)
include $(common_mk)
Expand Down
8 changes: 4 additions & 4 deletions scripts/govtool/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include ../../govtool/backend/Makefile
include ../../govtool/frontend/Makefile
include ../../govtool/status-service/Makefile
include ../../govtool/metadata-validation/Makefile
include backend.mk
include frontend.mk
include status-service.mk
include metadata-validation.mk
include utils.mk
include info.mk
include config.mk
Expand Down
2 changes: 1 addition & 1 deletion govtool/backend/Makefile → scripts/govtool/backend.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
common_mk := ../../scripts/govtool/common.mk
common_mk := common.mk
ifeq ($(origin $(common_mk)), undefined)
$(eval $(common_mk) := included)
include $(common_mk)
Expand Down
2 changes: 1 addition & 1 deletion scripts/govtool/config.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
common_mk := ../../scripts/govtool/common.mk
common_mk := common.mk
ifeq ($(origin $(common_mk)), undefined)
$(eval $(common_mk) := included)
include $(common_mk)
Expand Down
2 changes: 1 addition & 1 deletion govtool/frontend/Makefile → scripts/govtool/frontend.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
common_mk := ../../scripts/govtool/common.mk
common_mk := common.mk
ifeq ($(origin $(common_mk)), undefined)
$(eval $(common_mk) := included)
include $(common_mk)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
common_mk := ../../scripts/govtool/common.mk
common_mk := common.mk
ifeq ($(origin $(common_mk)), undefined)
$(eval $(common_mk) := included)
include $(common_mk)
Expand Down
21 changes: 21 additions & 0 deletions scripts/govtool/status-service.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
common_mk := common.mk
ifeq ($(origin $(common_mk)), undefined)
$(eval $(common_mk) := included)
include $(common_mk)
endif

.DEFAULT_GOAL := push-status-service

# image tags
status_service_image_tag := $(shell git log -n 1 --format="%H" -- $(root_dir)/govtool/status-service)

.PHONY: build-status-service
build-status-service: docker-login
$(call check_image_on_ecr,status-service,$(status_service_image_tag)) || \
$(docker) build --tag "$(repo_url)/status-service:$(status_service_image_tag)" \
$(root_dir)/govtool/status-service

.PHONY: push-status-service
push-status-service: build-status-service
$(call check_image_on_ecr,status-service,$(status_service_image_tag)) || \
$(docker) push $(repo_url)/status-service:$(status_service_image_tag)

0 comments on commit c780dd8

Please sign in to comment.