From 8197ffeb07753bda630b5a377ef78d6849633526 Mon Sep 17 00:00:00 2001 From: Hiroto Funakoshi Date: Mon, 23 Oct 2023 14:44:35 +0900 Subject: [PATCH] Add make command to update template (#2212) * feat: add command to update template Signed-off-by: hlts2 * fix: use make update/template in the workflow Signed-off-by: hlts2 * fix: refactor variable names Signed-off-by: hlts2 * fix: call make update/template in update command Signed-off-by: hlts2 * fix: use make version command to get latest dependency version Signed-off-by: hlts2 --------- Signed-off-by: hlts2 --- ...update-pull-request-and-issue-template.yml | 19 +++++-------------- Makefile | 1 + Makefile.d/dependencies.mk | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/.github/workflows/update-pull-request-and-issue-template.yml b/.github/workflows/update-pull-request-and-issue-template.yml index 6702cf7bc9..4df04e3ae6 100644 --- a/.github/workflows/update-pull-request-and-issue-template.yml +++ b/.github/workflows/update-pull-request-and-issue-template.yml @@ -55,21 +55,12 @@ jobs: git checkout main git checkout -b ${BRANCH_NAME} - GO_VERSION=$(make version/go) - NGT_VERSION=$(make version/ngt) - KUBECTL_VERSION=$(make version/k8s) + make update/template - sed -i -e "s/^- Go Version: .*$/- Go Version: ${GO_VERSION}/" .github/ISSUE_TEMPLATE/bug_report.md - sed -i -e "s/^- Go Version: .*$/- Go Version: ${GO_VERSION}/" .github/ISSUE_TEMPLATE/security_issue_report.md - sed -i -e "s/^- Go Version: .*$/- Go Version: ${GO_VERSION}/" .github/PULL_REQUEST_TEMPLATE.md - - sed -i -e "s/^- NGT Version: .*$/- NGT Version: ${NGT_VERSION}/" .github/ISSUE_TEMPLATE/bug_report.md - sed -i -e "s/^- NGT Version: .*$/- NGT Version: ${NGT_VERSION}/" .github/ISSUE_TEMPLATE/security_issue_report.md - sed -i -e "s/^- NGT Version: .*$/- NGT Version: ${NGT_VERSION}/" .github/PULL_REQUEST_TEMPLATE.md - - sed -i -e "s/^- Kubernetes Version: .*$/- Kubernetes Version: ${KUBECTL_VERSION}/" .github/ISSUE_TEMPLATE/bug_report.md - sed -i -e "s/^- Kubernetes Version: .*$/- Kubernetes Version: ${KUBECTL_VERSION}/" .github/ISSUE_TEMPLATE/security_issue_report.md - sed -i -e "s/^- Kubernetes Version: .*$/- Kubernetes Version: ${KUBECTL_VERSION}/" .github/PULL_REQUEST_TEMPLATE.md + if git diff --quiet --exit-code; then + echo "Nothing updated" + exit 0 + fi git add .github/PULL_REQUEST_TEMPLATE.md .github/ISSUE_TEMPLATE/bug_report.md .github/ISSUE_TEMPLATE/security_issue_report.md git commit -S --signoff -m ":robot: Automatically update PULL_REQUEST_TEMPLATE and ISSUE_TEMPLATE" diff --git a/Makefile b/Makefile index d859cef45d..01b35bbec9 100644 --- a/Makefile +++ b/Makefile @@ -388,6 +388,7 @@ update: \ update/libs \ proto/all \ deps \ + update/template \ format \ go/deps diff --git a/Makefile.d/dependencies.mk b/Makefile.d/dependencies.mk index 7f528edc47..da430a2abd 100644 --- a/Makefile.d/dependencies.mk +++ b/Makefile.d/dependencies.mk @@ -172,3 +172,21 @@ update/vald: ## update vald client library made by clojure self version update/valdcli: curl --silent https://api.github.com/repos/vdaas/vald-client-clj/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/VALDCLI_VERSION + +.PHONY: update/template +## update PULL_REQUEST_TEMPLATE and ISSUE_TEMPLATE +update/template: + $(eval GO_VERSION := $(shell $(MAKE) -s version/go)) + $(eval NGT_VERSION := $(shell $(MAKE) -s version/ngt)) + $(eval KUBECTL_VERSION := $(shell $(MAKE) -s version/k8s)) + sed -i -e "s/^- Go Version: .*$$/- Go Version: $(GO_VERSION)/" $(ROOTDIR)/.github/ISSUE_TEMPLATE/bug_report.md + sed -i -e "s/^- Go Version: .*$$/- Go Version: $(GO_VERSION)/" $(ROOTDIR)/.github/ISSUE_TEMPLATE/security_issue_report.md + sed -i -e "s/^- Go Version: .*$$/- Go Version: $(GO_VERSION)/" $(ROOTDIR)/.github/PULL_REQUEST_TEMPLATE.md + + sed -i -e "s/^- NGT Version: .*$$/- NGT Version: $(NGT_VERSION)/" $(ROOTDIR)/.github/ISSUE_TEMPLATE/bug_report.md + sed -i -e "s/^- NGT Version: .*$$/- NGT Version: $(NGT_VERSION)/" $(ROOTDIR)/.github/ISSUE_TEMPLATE/security_issue_report.md + sed -i -e "s/^- NGT Version: .*$$/- NGT Version: $(NGT_VERSION)/" $(ROOTDIR)/.github/PULL_REQUEST_TEMPLATE.md + + sed -i -e "s/^- Kubernetes Version: .*$$/- Kubernetes Version: $(KUBECTL_VERSION)/" $(ROOTDIR)/.github/ISSUE_TEMPLATE/bug_report.md + sed -i -e "s/^- Kubernetes Version: .*$$/- Kubernetes Version: $(KUBECTL_VERSION)/" $(ROOTDIR)/.github/ISSUE_TEMPLATE/security_issue_report.md + sed -i -e "s/^- Kubernetes Version: .*$$/- Kubernetes Version: $(KUBECTL_VERSION)/" $(ROOTDIR)/.github/PULL_REQUEST_TEMPLATE.md