From de1b74cbd4799496c23cb2cc348be541181d22b0 Mon Sep 17 00:00:00 2001 From: cahillsf Date: Wed, 18 Oct 2023 16:15:39 -0400 Subject: [PATCH] update make target + corresponding doc --- Makefile | 10 +++------- docs/release/release-tasks.md | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index edb1fa36e993..919ad8133b05 100644 --- a/Makefile +++ b/Makefile @@ -1097,13 +1097,9 @@ release-alias-tag: ## Add the release alias tag to the last build tag gcloud container images add-tag $(CAPIM_CONTROLLER_IMG):$(TAG) $(CAPIM_CONTROLLER_IMG):$(RELEASE_ALIAS_TAG) gcloud container images add-tag $(TEST_EXTENSION_IMG):$(TAG) $(TEST_EXTENSION_IMG):$(RELEASE_ALIAS_TAG) -.PHONY: release-notes -release-notes: $(RELEASE_NOTES_DIR) $(RELEASE_NOTES) - if [ -n "${PRE_RELEASE}" ]; then \ - echo ":rotating_light: This is a RELEASE CANDIDATE. Use it only for testing purposes. If you find any bugs, file an [issue](https://github.com/kubernetes-sigs/cluster-api/issues/new)." > $(RELEASE_NOTES_DIR)/$(RELEASE_TAG).md; \ - else \ - go run ./hack/tools/release/notes.go --from=$(PREVIOUS_TAG) > $(RELEASE_NOTES_DIR)/$(RELEASE_TAG).md; \ - fi +.PHONY: release-notes-tool +release-notes-tool: + go build -o bin/notes hack/tools/release/notes.go .PHONY: promote-images promote-images: $(KPROMO) diff --git a/docs/release/release-tasks.md b/docs/release/release-tasks.md index 8a7848ab0054..b80fc059499f 100644 --- a/docs/release/release-tasks.md +++ b/docs/release/release-tasks.md @@ -321,7 +321,7 @@ The goal of this task to make the book for the current release available under e 1. Checkout the `main` branch. 1. Build the release note tools binary. ```bash - go build -o bin/notes hack/tools/release/notes.go + make release-notes-tool ``` 1. Checkout the latest commit on the release branch, e.g. `release-1.4`, or the main branch if the release branch doesn't yet exist (e.g. beta release). 1. Generate release notes with: