Fix changelog commit workflow

baelter · baelter · commit 6adf21993e13 · 2025-09-12T13:52:52.000+02:00
- Add --update-changelog flag to update changelog without creating tag
- Include changelog update in version script so it gets committed with version
- Both VERSION constant and CHANGELOG.md now committed together
- Separate tag creation remains available via npm run create-tag
diff --git a/package.json b/package.json
@@ -42,8 +42,8 @@
     "postbuild": "echo '{\"type\": \"commonjs\"}' > lib/cjs/package.json",
     "prepare": "npm run build",
     "preversion": "npm run test:local",
-    "version": "sed -i'' \"s/VERSION = .*/VERSION = \\\"$npm_package_version\\\"/\" src/amqp-base-client.ts && npm run format && node scripts/release-tag.js --update-changelog-only && git add src/amqp-base-client.ts CHANGELOG.md",
-    "postversion": "git tag v$npm_package_version -m \"$(node scripts/release-tag.js --get-changelog-content)\" && git push && git push --tags",
+    "version": "sed -i'' \"s/VERSION = .*/VERSION = \\\"$npm_package_version\\\"/\" src/amqp-base-client.ts && npm run format && node scripts/release-tag.js --update-changelog && git add src/amqp-base-client.ts CHANGELOG.md",
+    "postversion": "git push && git push --tags",
     "release": "npm version patch",
     "release:minor": "npm version minor",
     "release:major": "npm version major"
diff --git a/scripts/release-tag.js b/scripts/release-tag.js
@@ -4,20 +4,17 @@ import fs from "fs"
 import { execSync } from "child_process"
 
 function main() {
-  // Check command line flags
-  const updateChangelogOnly = process.argv.includes("--update-changelog-only")
-  const getChangelogContent = process.argv.includes("--get-changelog-content")
+  // Check if we should only update changelog (no tag creation)
+  const updateChangelogOnly = process.argv.includes("--update-changelog")
   
   // Read package.json to get current version
   const pkg = JSON.parse(fs.readFileSync("package.json", "utf8"))
   const version = pkg.version
 
   if (updateChangelogOnly) {
     console.log(`Updating changelog for version ${version}...`)
-  } else if (getChangelogContent) {
-    // Just get the changelog content for this version and exit
   } else {
-    console.log(`Updating changelog and creating tag for version ${version}...`)
+    console.log(`Creating tag for version ${version}...`)
   }
 
   // Read changelog
@@ -32,7 +29,7 @@ function main() {
   // Check if version already exists in changelog
   if (changelog.includes(newVersionHeader) || changelog.includes(versionHeader)) {
     console.log(`Version ${version} already exists in changelog. Skipping update.`)
-  } else if (changelog.includes(unreleasedHeader) && !getChangelogContent) {
+  } else if (changelog.includes(unreleasedHeader)) {
     console.log("Updating [Unreleased] section to current version...")
     changelog = changelog.replace(unreleasedHeader, newVersionHeader)
 
@@ -46,13 +43,10 @@ function main() {
 
     // Write updated changelog back to file
     fs.writeFileSync("CHANGELOG.md", changelog, "utf8")
-
-    // Stage the changelog file for commit
-    execSync("git add CHANGELOG.md", { stdio: "inherit" })
-    console.log("✅ Updated CHANGELOG.md and staged for commit")
+    console.log("✅ Updated CHANGELOG.md")
   }
 
-  // If only updating changelog, exit here
+  // If only updating changelog, exit here (don't create tag)
   if (updateChangelogOnly) {
     return
   }
@@ -72,12 +66,6 @@ function main() {
   // Extract the content for this version
   const content = changelog.substring(startIdx, nextVersionIdx === -1 ? undefined : nextVersionIdx).trim()
 
-  // If only getting changelog content, just output it and exit
-  if (getChangelogContent) {
-    console.log(content)
-    return
-  }
-
   console.log("Changelog content:")
   console.log(content)
   console.log()
