Skip to content

Commit b30fb3b

Browse files
committed
update utils.sh
1 parent 64cccd8 commit b30fb3b

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

scripts/utils.sh

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,30 @@ output_changes_file_version_marker() {
4848

4949

5050
update_changes_file() {
51-
local LATEST_STABLE_RELEASE
52-
LATEST_STABLE_RELEASE=$(git describe --tags $(git rev-list --tags --max-count=1))
51+
local LAST_STABLE_RELEASE NEXT_STABLE_RELEASE
52+
53+
LAST_STABLE_RELEASE=$(git describe --tags $(git rev-list --tags --max-count=1))
54+
55+
LAST_MAJOR_MINOR="${LAST_STABLE_RELEASE%.*}"
56+
LAST_PATCH="${LAST_STABLE_RELEASE##*.}"
57+
58+
NEXT_PATCH=$(($LAST_PATCH + 1))
59+
NEXT_STABLE_RELEASE="${LAST_MAJOR_MINOR}.${NEXT_PATCH}"
5360

5461
[[ -f CHANGES ]] && mv CHANGES CHANGES.old
5562

56-
output_changes_file_version_marker "${LATEST_STABLE_RELEASE}" > CHANGES
63+
output_changes_file_version_marker "${NEXT_STABLE_RELEASE}" > CHANGES
5764

5865
{ git log \
5966
--pretty=format:"[%ai] %<(69,trunc) %s %><(15) %aN {%h}" \
60-
--cherry-pick "${LATEST_STABLE_RELEASE}...HEAD"; } >> CHANGES
67+
--cherry-pick "${LAST_STABLE_RELEASE}...HEAD"; } >> CHANGES
6168

6269

6370
[[ -f CHANGES.old ]] && echo "" >> CHANGES && cat CHANGES.old >> CHANGES && rm CHANGES.old
6471

65-
#git add CHANGES
66-
#git commit -m 'RELEASE PREP :: Update CHANGES file.'
67-
#git push
72+
git add CHANGES
73+
git commit -m 'RELEASE PREP :: Update CHANGES file.'
74+
git push
6875
}
6976

7077

0 commit comments

Comments
 (0)