From 2b1a259d47a3edf499497dc90903e4c7fbf02bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Scha=CC=88fer?= <101886095+PeterSchafer@users.noreply.github.com> Date: Mon, 6 May 2024 15:41:19 +0200 Subject: [PATCH] fix: remove dependency for release notes --- Makefile | 2 +- release-scripts/prepare-release.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f8da4776247..3001848513b 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,7 @@ $(BINARY_OUTPUT_FOLDER)/release.json: # We're using this to remove CLIv2 changes in v1's changelogs. # :(exclude) syntax: https://git-scm.com/docs/gitglossary.html#Documentation/gitglossary.txt-exclude # Release notes uses version from package.json so we need to prepack beforehand. -$(BINARY_OUTPUT_FOLDER)/RELEASE_NOTES.md: prepack | $(BINARY_RELEASES_FOLDER_TS_CLI) +$(BINARY_OUTPUT_FOLDER)/RELEASE_NOTES.md: npx conventional-changelog-cli -l -r 1 -n ./release-scripts/conventional-changelog-cli-config.js > $(BINARY_OUTPUT_FOLDER)/RELEASE_NOTES.md $(BINARY_OUTPUT_FOLDER)/fips/RELEASE_NOTES.md: $(BINARY_OUTPUT_FOLDER)/RELEASE_NOTES.md $(BINARY_OUTPUT_FOLDER)/fips diff --git a/release-scripts/prepare-release.sh b/release-scripts/prepare-release.sh index 9e5aa876210..e1487984d46 100755 --- a/release-scripts/prepare-release.sh +++ b/release-scripts/prepare-release.sh @@ -22,11 +22,13 @@ if [ -f binary-releases/RELEASE_NOTES.md ]; then fi # Generate the release notes baseline from the commits -make binary-releases/RELEASE_NOTES.md clean-package-files format +make binary-releases/RELEASE_NOTES.md format # if the release notes are generated locally, the version contains something like X.Y.Z-dev.hash # the replacement below ensures that the version in the RELEASE_NOTES.md is X.Y.Z -sed -i "version" -e "s/$(cat binary-releases/version)/$(npx semver --coerce $(cat binary-releases/version))/g" binary-releases/RELEASE_NOTES.md +VERSION_TO_REPLACE=$(npm pkg get version | tr -d '"') +VERSION_TO_REPLACE_WITH=$(npx semver --coerce $(cat binary-releases/version)) +sed -i "version" -e "s/$VERSION_TO_REPLACE/$VERSION_TO_REPLACE_WITH/g" binary-releases/RELEASE_NOTES.md # Commit and push the release notes git add -f binary-releases/RELEASE_NOTES.md