From 8456089f1653ef6f86a9adb789a2851e35835a4f Mon Sep 17 00:00:00 2001 From: Brandon Croft Date: Fri, 18 Sep 2026 15:09:02 -0600 Subject: [PATCH 1/2] chore: fix cleanup-release --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 084e45c..b873167 100644 --- a/Makefile +++ b/Makefile @@ -84,17 +84,18 @@ prepare-release: gen/openapi @echo "$$(shasum -a 256 $(SKILL_EMBEDDED) | cut -d' ' -f1) v$(VERSION)" >> $(SKILL_HASHES) @echo "Appended sha256 for $(SKILL_EMBEDDED) to $(SKILL_HASHES)" @npx -q changie@$(CHANGIE_VERSION) batch $(VERSION) + @npx -q changie@$(CHANGIE_VERSION) merge .PHONY: cleanup-release cleanup-release: @if [ -z "$(DEV_VERSION)" ]; then echo "DEV_VERSION is not set"; exit 1; fi - @if ! $$(git tag -l v$$(cat version/VERSION) >/dev/null 2>&1); then echo "Lastest version $$(cat version/VERSION) has not been released"; exit 1; fi + @if ! git rev-parse --verify --quiet refs/tags/v$$(cat $(VERSION_FILE)) >/dev/null 2>&1; then echo "Latest version $$(cat $(VERSION_FILE)) has not been released"; exit 1; fi - @echo $(DEV_VERSION) > $(VERSION_FILE) @echo "## Unreleased" > $(CHANGELOG_FILE) @echo "" >> $(CHANGELOG_FILE) - @echo "This file will be populated by automation before release. See this [CHANGELOG.md](https://github.com/hashicorp/tfctl-cli/blob/v$(VERSION)/CHANGELOG.md) for information about the latest release." >> $(CHANGELOG_FILE) + @echo "This file will be populated by automation before release. See this [CHANGELOG.md](https://github.com/hashicorp/tfctl-cli/blob/v$$(cat $(VERSION_FILE))/CHANGELOG.md for information about the latest release." >> $(CHANGELOG_FILE) @echo "Release cleanup finished, version is now $(DEV_VERSION)" + @echo $(DEV_VERSION) > $(VERSION_FILE) # Install development tools .PHONY: tools From 59e91853c124426ac7818083b0325a348a0d1f4d Mon Sep 17 00:00:00 2001 From: Brandon Croft Date: Mon, 21 Sep 2026 13:20:00 -0600 Subject: [PATCH 2/2] fix CHANGELOG link --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b873167..f0b58eb 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,7 @@ cleanup-release: @echo "## Unreleased" > $(CHANGELOG_FILE) @echo "" >> $(CHANGELOG_FILE) - @echo "This file will be populated by automation before release. See this [CHANGELOG.md](https://github.com/hashicorp/tfctl-cli/blob/v$$(cat $(VERSION_FILE))/CHANGELOG.md for information about the latest release." >> $(CHANGELOG_FILE) + @echo "This file will be populated by automation before release. See this [CHANGELOG.md](https://github.com/hashicorp/tfctl-cli/blob/v$$(cat $(VERSION_FILE))/CHANGELOG.md) for information about the latest release." >> $(CHANGELOG_FILE) @echo "Release cleanup finished, version is now $(DEV_VERSION)" @echo $(DEV_VERSION) > $(VERSION_FILE)