Skip to content

A self-hosted media server and file management system

fix(changelog): scope isnt captured correctly

aminnausin2817cb378bdb
diff --git a/.github/workflows/generate-changelog.yml b/.github/workflows/generate-changelog.yml
index 651addc4..9abf2d50 100644
--- a/.github/workflows/generate-changelog.yml
+++ b/.github/workflows/generate-changelog.yml
@@ -95,11 +95,9 @@ jobs:
echo "" >> $CHANGELOG_FILE
printf "%s\n" "$MATCHES" | while IFS=$'\t' read -r msg hash; do
- if echo "$msg" | grep -Eq '^[a-zA-Z_]+!?\\([^)]+\\):'; then
- scope=$(echo "$msg" | sed -nE 's/^[a-zA-Z_]+!?\(([^)]+)\).*/\1/p')
+ scope=$(echo "$msg" | sed -nE 's/^[a-zA-Z_]+!?\(([^)]+)\):.*/\1/p')
+ if [ -n "$scope" ]; then
scope="**$scope:** "
- else
- scope=""
fi
clean_msg=$(echo "$msg" | sed -E 's/^[a-zA-Z_]+!?(\([^)]+\))?:[[:space:]]*//')
@@ -132,7 +130,13 @@ jobs:
echo "" >> $CHANGELOG_FILE
printf "%s\n" "$BREAKING" | while IFS=$'\t' read -r msg hash; do
- clean_msg=$(echo "$msg" | sed -E 's/^[a-z_]+!?\([^)]+\)?:\s*//')
+ scope=$(echo "$msg" | sed -nE 's/^[a-zA-Z_]+!?\(([^)]+)\):.*/\1/p')
+ if [ -n "$scope" ]; then
+ scope="**$scope:** "
+ fi
+
+ clean_msg=$(echo "$msg" | sed -E 's/^[a-zA-Z_]+!?(\([^)]+\))?:[[:space:]]*//')
+
printf -- "- %s%s (\`%s\`)\n" "$scope" "$clean_msg" "$hash" >> "$CHANGELOG_FILE"
done
diff --git a/changelog.sh b/changelog.sh
index 93a9866d..88d069e8 100644
--- a/changelog.sh
+++ b/changelog.sh
@@ -56,11 +56,9 @@ write_section() {
echo "" >> $CHANGELOG_FILE
printf "%s\n" "$MATCHES" | while IFS=$'\t' read -r msg hash; do
- if echo "$msg" | grep -Eq '^[a-zA-Z_]+!?\\([^)]+\\):'; then
- scope=$(echo "$msg" | sed -nE 's/^[a-zA-Z_]+!?\(([^)]+)\).*/\1/p')
+ scope=$(echo "$msg" | sed -nE 's/^[a-zA-Z_]+!?\(([^)]+)\):.*/\1/p')
+ if [ -n "$scope" ]; then
scope="**$scope:** "
- else
- scope=""
fi
clean_msg=$(echo "$msg" | sed -E 's/^[a-zA-Z_]+!?(\([^)]+\))?:[[:space:]]*//')
@@ -93,7 +91,13 @@ if [ -n "$BREAKING" ]; then
echo "" >> $CHANGELOG_FILE
printf "%s\n" "$BREAKING" | while IFS=$'\t' read -r msg hash; do
- clean_msg=$(echo "$msg" | sed -E 's/^[a-z_]+!?\([^)]+\)?:\s*//')
+ scope=$(echo "$msg" | sed -nE 's/^[a-zA-Z_]+!?\(([^)]+)\):.*/\1/p')
+ if [ -n "$scope" ]; then
+ scope="**$scope:** "
+ fi
+
+ clean_msg=$(echo "$msg" | sed -E 's/^[a-zA-Z_]+!?(\([^)]+\))?:[[:space:]]*//')
+
printf -- "- %s%s (\`%s\`)\n" "$scope" "$clean_msg" "$hash" >> "$CHANGELOG_FILE"
done