@@ -48,7 +48,7 @@ function gen_patch_relnotes() {
48
48
rm out.md || true
49
49
rm -rf /tmp/k8s-repo || true
50
50
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 " \
52
52
--org=kubernetes-csi --repo=" $1 " \
53
53
--required-author=" " --markdown-links --output out.md
54
54
}
@@ -57,11 +57,14 @@ for rel in "${releases[@]}"; do
57
57
read -r repo version <<< " $rel"
58
58
59
59
# Parse minor version
60
- minorPattern =" (^[[:digit:]]+\.[[:digit:]]+)\."
61
- [[ " $version " =~ $minorPattern ]]
60
+ minorPatchPattern =" (^[[:digit:]]+\.[[:digit:]]+)\.([[:digit:]]+) "
61
+ [[ " $version " =~ $minorPatchPattern ]]
62
62
minor=" ${BASH_REMATCH[1]} "
63
+ patch=" ${BASH_REMATCH[2]} "
63
64
64
- echo " $repo " " $version " " $minor "
65
+ echo " $repo $version $minor $patch "
66
+ prevPatch=" $(( patch- 1 )) "
67
+ prevVer=" v$minor .$prevPatch "
65
68
66
69
pushd " $repo /CHANGELOG"
67
70
@@ -74,7 +77,7 @@ for rel in "${releases[@]}"; do
74
77
git checkout --track " upstream/release-$minor " -b " $branch "
75
78
76
79
# Generate release notes
77
- gen_patch_relnotes " $repo " " release-$minor "
80
+ gen_patch_relnotes " $repo " " release-$minor " " $prevVer "
78
81
cat > tmp.md << EOF
79
82
# Release notes for v$version
80
83
84
87
85
88
cat out.md >> tmp.md
86
89
echo >> tmp.md
90
+ rm out.md
87
91
88
92
file=" CHANGELOG-$minor .md"
89
93
cat " $file " >> tmp.md
0 commit comments