Skip to content

Commit 46b05f2

Browse files
authored
CHANGELOG generator fixes (#8334)
- adds the newly introduced GUCs - fixes the links from the .unlreleased files Disable-check: approval-count Disable-check: force-changelog-file
1 parent 073b68e commit 46b05f2

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

scripts/changelog/generate.sh

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,27 @@ echo_changelog() {
99
echo "${1}"
1010
# skip the template and release notes files
1111
grep -i "${2}" .unreleased/* | \
12-
cut -d: -f3- | sort | uniq | sed -e 's/^[[:space:]]*//' -e 's/^/* /' -e 's!#\([0-9]\+\)![#\1](https://github.com/timescale/timescaledb/pull/\1)!'
12+
cut -d: -f3- | sort | uniq | sed -e 's/^[[:space:]]*//' -e 's/^/* /' -e 's!#\([0-9][0-9]*\)![#\1](https://github.com/timescale/timescaledb/pull/\1)!g'
1313
echo
1414
}
1515

16+
# Build a delta of the GUCs between two releases
17+
#
18+
# Param: previous release
19+
# Param: release branch
20+
#
21+
echo_gucs() {
22+
echo "**GUCs**"
23+
git diff ${1}..${2} src/guc.c | grep EXTOPTION | grep -o '"[^"]*"' | sed 's/^/* /' | sort | sed 's/"/`/g'
24+
}
25+
1626
get_version_config_var() {
1727
grep "${1}" version.config | awk '{print $3}' | sed 's/-dev//'
1828
}
1929

2030
RELEASE_NEXT=$(get_version_config_var '^version')
2131
RELEASE_PREVIOUS=$(get_version_config_var '^previous_version')
32+
RELEASE_BRANCH="${RELEASE_NEXT/%.[0-9]/.x}"
2233

2334
echo "Building CHANGELOG"
2435
{
@@ -31,8 +42,7 @@ echo "Building CHANGELOG"
3142
echo ""
3243
echo_changelog '**Features**' '^Implements:'
3344
echo_changelog '**Bugfixes**' '^Fixes:'
34-
echo "**GUCs**"
35-
echo "* "
45+
echo_gucs $RELEASE_PREVIOUS $RELEASE_BRANCH
3646
echo ""
3747
echo_changelog '**Thanks**' '^Thanks:'
3848
} > CHANGELOG_next.md

scripts/release/build_post_release_artefacts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ curl --silent --fail -o CHANGELOG.md $URL_CHANGELOG
4747

4848
# .unreleased files
4949
echo "remove .unreleased files"
50-
echo "TODO"
50+
git diff ${PUBLISHED_VERSION}..main .unreleased/* | xargs rm -fv
5151

5252
# Set new previous version
5353
echo "Set new previous version version.config to ${PUBLISHED_VERSION}"

0 commit comments

Comments
 (0)