From 15ea31c086bdd2a092e4f916c13506ffced21085 Mon Sep 17 00:00:00 2001 From: Joe Niland Date: Thu, 1 Feb 2024 09:11:05 +1100 Subject: [PATCH 1/2] Specify gomplate path in readme/Makefile --- README.md | 2 +- modules/readme/Makefile | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4df36590..8c9b7567 100644 --- a/README.md +++ b/README.md @@ -387,7 +387,7 @@ We deliver 10x the value for a fraction of the cost of a full-time engineer. Our [![README Commercial Support][readme_commercial_support_img]][readme_commercial_support_link] ## License -[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=for-the-badge)](https://opensource.org/licenses/Apache-2.0) See [LICENSE](LICENSE) for full details. diff --git a/modules/readme/Makefile b/modules/readme/Makefile index 327f2fe5..f8657e17 100644 --- a/modules/readme/Makefile +++ b/modules/readme/Makefile @@ -5,6 +5,8 @@ export README_YAML ?= README.yaml export README_TEMPLATE_REPO_REMOTE_NAME ?= origin export README_TEMPLATE_REPO_REMOTE ?= $(shell [ -d .git ] && git remote get-url $(README_TEMPLATE_REPO_REMOTE_NAME)) +export GOMPLATE_PATH ?= $(BUILD_HARNESS_PATH)/vendor/gomplate + # Parse https://github.com/... ifneq (,$(findstring https://github.com/,$(README_TEMPLATE_REPO_REMOTE))) URL_NO_PROTOCOL := $(subst https://github.com/,,$(README_TEMPLATE_REPO_REMOTE)) @@ -78,8 +80,8 @@ readme/lint: ## Create README.md by building it from README.yaml readme/build: readme/deps $(README_TEMPLATE_FILE) $(README_DEPS) - @gomplate --file $(README_TEMPLATE_FILE) --out $(README_FILE) --config $(BUILD_HARNESS_PATH)/configs/gomplate.yaml + @$(GOMPLATE_PATH) --file $(README_TEMPLATE_FILE) --out $(README_FILE) --config $(BUILD_HARNESS_PATH)/configs/gomplate.yaml @echo "Generated $(README_FILE) from $(README_TEMPLATE_FILE) using data from $(README_TEMPLATE_YAML)" readme/generate-related-references: - @$(BUILD_HARNESS_PATH)/bin/generate_related_references.py + @$(BUILD_HARNESS_PATH)/bin/generate_related_references.py \ No newline at end of file From b4f87a4da20b459fb9b13340320d983bfb31663f Mon Sep 17 00:00:00 2001 From: Joe Niland Date: Thu, 1 Feb 2024 09:58:50 +1100 Subject: [PATCH 2/2] fix linting issues --- modules/readme/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/readme/Makefile b/modules/readme/Makefile index f8657e17..b1ad2b00 100644 --- a/modules/readme/Makefile +++ b/modules/readme/Makefile @@ -84,4 +84,4 @@ readme/build: readme/deps $(README_TEMPLATE_FILE) $(README_DEPS) @echo "Generated $(README_FILE) from $(README_TEMPLATE_FILE) using data from $(README_TEMPLATE_YAML)" readme/generate-related-references: - @$(BUILD_HARNESS_PATH)/bin/generate_related_references.py \ No newline at end of file + @$(BUILD_HARNESS_PATH)/bin/generate_related_references.py