Skip to content

Commit c7bb972

Browse files
committed
Fix release notes script to use fixed tags
1 parent 463a0e9 commit c7bb972

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

generate_patch_release_notes.sh renamed to generate-patch-release-notes.sh

+9-5
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function gen_patch_relnotes() {
4848
rm out.md || true
4949
rm -rf /tmp/k8s-repo || true
5050
GITHUB_TOKEN="$CSI_RELEASE_TOKEN" \
51-
release-notes --discover=patch-to-latest --branch="$2" \
51+
release-notes --start-rev="$3" --end-rev="$2" --branch="$2" \
5252
--org=kubernetes-csi --repo="$1" \
5353
--required-author="" --markdown-links --output out.md
5454
}
@@ -57,11 +57,14 @@ for rel in "${releases[@]}"; do
5757
read -r repo version <<< "$rel"
5858

5959
# Parse minor version
60-
minorPattern="(^[[:digit:]]+\.[[:digit:]]+)\."
61-
[[ "$version" =~ $minorPattern ]]
60+
minorPatchPattern="(^[[:digit:]]+\.[[:digit:]]+)\.([[:digit:]]+)"
61+
[[ "$version" =~ $minorPatchPattern ]]
6262
minor="${BASH_REMATCH[1]}"
63+
patch="${BASH_REMATCH[2]}"
6364

64-
echo "$repo" "$version" "$minor"
65+
echo "$repo $version $minor $patch"
66+
prevPatch="$((patch-1))"
67+
prevVer="v$minor.$prevPatch"
6568

6669
pushd "$repo/CHANGELOG"
6770

@@ -74,7 +77,7 @@ for rel in "${releases[@]}"; do
7477
git checkout --track "upstream/release-$minor" -b "$branch"
7578

7679
# Generate release notes
77-
gen_patch_relnotes "$repo" "release-$minor"
80+
gen_patch_relnotes "$repo" "release-$minor" "$prevVer"
7881
cat > tmp.md <<EOF
7982
# Release notes for v$version
8083
@@ -84,6 +87,7 @@ EOF
8487

8588
cat out.md >> tmp.md
8689
echo >> tmp.md
90+
rm out.md
8791

8892
file="CHANGELOG-$minor.md"
8993
cat "$file" >> tmp.md

0 commit comments

Comments
 (0)