Skip to content

Commit ec42b64

Browse files
author
Cecile Robert-Michon
committed
Handle pre-releases in release-notes make target
1 parent df6c654 commit ec42b64

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,10 @@ set-manifest-pull-policy:
419419
## --------------------------------------
420420

421421
RELEASE_TAG ?= $(shell git describe --abbrev=0 2>/dev/null)
422+
# if the release tag contains a hyphen, treat it as a pre-release
423+
ifneq (,$(findstring -,$(RELEASE_TAG)))
424+
PRE_RELEASE=true
425+
endif
422426
# the previous release tag, e.g., v0.3.9, excluding pre-release tags
423427
PREVIOUS_TAG ?= $(shell git tag -l | grep -E "^v[0-9]+\.[0-9]+\.[0-9]+$$" | sort -V | grep -B1 $(RELEASE_TAG) | head -n 1 2>/dev/null)
424428
RELEASE_DIR ?= out
@@ -484,9 +488,11 @@ release-alias-tag: # Adds the tag to the last build tag.
484488

485489
.PHONY: release-notes
486490
release-notes: $(RELEASE_NOTES) $(RELEASE_NOTES_DIR)
487-
$(RELEASE_NOTES) --org $(GIT_ORG_NAME) --repo $(GIT_REPO_NAME) --branch $(RELEASE_BRANCH) --start-rev $(PREVIOUS_TAG) --end-rev $(RELEASE_TAG) --output $(RELEASE_NOTES_DIR)/tmp-release-notes.md
488-
sed 's/\[SIG Cluster Lifecycle\]//g' $(RELEASE_NOTES_DIR)/tmp-release-notes.md > $(RELEASE_NOTES_DIR)/release-notes-$(RELEASE_TAG).md
489-
rm -f $(RELEASE_NOTES_DIR)/tmp-release-notes.md
491+
@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-provider-azure/issues/new)." > $(RELEASE_NOTES_DIR)/release-notes-$(RELEASE_TAG).md; \
492+
else $(RELEASE_NOTES) --org $(GIT_ORG_NAME) --repo $(GIT_REPO_NAME) --branch $(RELEASE_BRANCH) --start-rev $(PREVIOUS_TAG) --end-rev $(RELEASE_TAG) --output $(RELEASE_NOTES_DIR)/tmp-release-notes.md; \
493+
sed 's/\[SIG Cluster Lifecycle\]//g' $(RELEASE_NOTES_DIR)/tmp-release-notes.md > $(RELEASE_NOTES_DIR)/release-notes-$(RELEASE_TAG).md; \
494+
rm -f $(RELEASE_NOTES_DIR)/tmp-release-notes.md; \
495+
fi
490496

491497
## --------------------------------------
492498
## Development

0 commit comments

Comments
 (0)