From 81b81445e3794f54eda11429b8ce9a40f51f997b Mon Sep 17 00:00:00 2001 From: Mustafa Kara Date: Tue, 27 Feb 2024 18:29:43 +0300 Subject: [PATCH] Fix pipelines #minor Signed-off-by: Mustafa Kara --- .mk/{release_release.mk => release.mk} | 4 ++-- .mk/tools.mk | 3 +++ Makefile | 13 ------------- 3 files changed, 5 insertions(+), 15 deletions(-) rename .mk/{release_release.mk => release.mk} (96%) create mode 100644 .mk/tools.mk diff --git a/.mk/release_release.mk b/.mk/release.mk similarity index 96% rename from .mk/release_release.mk rename to .mk/release.mk index 9339384..a28f2ae 100644 --- a/.mk/release_release.mk +++ b/.mk/release.mk @@ -14,8 +14,8 @@ else ifeq ($(COMMIT_TYPE),patch) NEXT_VERSION= v$(MAJOR).$(MINOR).$(shell echo $$(($(PATCH)+1))) endif -.PHONY: release/tag -release/tag: +.PHONY: release +release: ifneq ($(NEXT_VERSION),) @echo "Creating tag $(NEXT_VERSION)" @git tag $(NEXT_VERSION) diff --git a/.mk/tools.mk b/.mk/tools.mk new file mode 100644 index 0000000..12dcae5 --- /dev/null +++ b/.mk/tools.mk @@ -0,0 +1,3 @@ + +.PHONY: tools +tools: tools/terraform tools/terragrunt tools/tflint tools/terraform_docs \ No newline at end of file diff --git a/Makefile b/Makefile index 8ca69b4..b629eca 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,3 @@ include $(wildcard .mk/*.mk) -.PHONY: help -help: ## Provides help menu - @echo "Usage:" - @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) |\ - awk 'BEGIN {FS = ":.*?## "}; {printf "make ${CYAN}%-30s${CNone} %s\n", $$1, $$2}' -.PHONY: tools -tools: tools/terraform tools/terragrunt tools/tflint tools/terraform_docs ## Install Required Tools - -.PHONY: tag -tag: release/tag ## Generate tag from the last commit - -.PHONY: release -release: release/release ## Generate release from tag \ No newline at end of file