From b1e460314edd7374831df61a61a9f85604c68b38 Mon Sep 17 00:00:00 2001
From: Rainer Killinger <killinger@hrz.uni-frankfurt.de>
Date: Tue, 17 Jan 2023 13:33:10 +0100
Subject: [PATCH] refactor: changelog generation for tags

---
 package.json  | 3 +--
 src/common.ts | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 37017903..4e874875 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,9 @@
   "scripts": {
     "build": "npm run lint && npm run compile",
     "compile": "rimraf lib && tsc --outDir lib && prepend lib/cli.js '#!/usr/bin/env node\n'",
-    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md && git commit -m \"docs: update changelog\"",
+    "version": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md",
     "documentation": "typedoc --out docs --readme README.md --includeVersion --listInvalidSymbolLinks --entryPointStrategy expand src",
     "prepublishOnly": "npm ci && npm run build",
-    "postversion": "npm run changelog",
     "preversion": "npm run prepublishOnly",
     "push": "git push && git push origin \"v$npm_package_version\"",
     "test": "echo \"Error: no test specified\" && exit 1",
diff --git a/src/common.ts b/src/common.ts
index 09d34adc..784dc408 100644
--- a/src/common.ts
+++ b/src/common.ts
@@ -732,10 +732,9 @@ export function getRules(configuration: Configuration): Rules {
 
   // expected scripts
   const scripts: {[k: string]: string} = {
-    'changelog':
-      "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md && git commit -m 'docs: update changelog'",
+    'version': 'conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md',
     'check-configuration': 'openstapps-configuration',
-    'preversion': 'npm run prepublishOnly && npm run changelog',
+    'preversion': 'npm run prepublishOnly',
     'push': 'git push && git push origin "v$npm_package_version"',
     'lint': 'eslint --ext .ts src/',
   };