Skip to content

Commit f353016

Browse files
committed
Add bump conflict resolution to version bumping script
Fix package version with below keyword: MINOR_CHANGE
1 parent 69b99d1 commit f353016

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

pyproject.toml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,19 @@ args = [
117117
shell = """
118118
HEAD_COMMIT_CONTENT=$(git log -1)
119119
120+
MAJOR_BUMP_KEYWORD="MAJOR_CHANGE"
121+
MINOR_BUMP_KEYWORD="MINOR_CHANGE"
122+
123+
MAJOR_CHANGE_PREFIX=${HEAD_COMMIT_CONTENT%%$MAJOR_BUMP_KEYWORD*}
124+
MAJOR_CHANGE_INDEX=${#MAJOR_CHANGE_PREFIX}
125+
126+
MINOR_CHANGE_PREFIX=${HEAD_COMMIT_CONTENT%%$MINOR_BUMP_KEYWORD*}
127+
MINOR_CHANGE_INDEX=${#MINOR_CHANGE_PREFIX}
128+
120129
RULE="patch"
121-
if [[ $HEAD_COMMIT_CONTENT == *"MAJOR_CHANGE"* ]]; then
130+
if [[ $MAJOR_CHANGE_INDEX -gt $MINOR_CHANGE_INDEX && $MAJOR_CHANGE_INDEX -ne ${#HEAD_COMMIT_CONTENT} ]]; then
122131
RULE="major"
123-
elif [[ $HEAD_COMMIT_CONTENT == *"MINOR_CHANGE"* ]]; then
132+
elif [[$MINOR_CHANGE_INDEX -gt $MAJOR_CHANGE_INDEX && $MINOR_CHANGE_INDEX -ne ${#HEAD_COMMIT_CONTENT} ]]; then
124133
RULE="minor"
125134
fi
126135

0 commit comments

Comments
 (0)