infra: update check-since-version as it blocked #12151

checkstyle · Apr 26, 2023 · a0df847 · a0df847
1 parent a65477c
commit a0df847
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/.ci/validation.sh b/.ci/validation.sh
@@ -482,9 +482,18 @@ check-since-version)
 
   if [ -f "$NEW_CHECK_FILE" ]; then
     echo "New Check detected: $NEW_CHECK_FILE"
-    CS_POM_VERSION="$(getCheckstylePomVersion)"
-    CS_RELEASE_VERSION=$(echo "$CS_POM_VERSION" | cut -d '-' -f 1)
+    CS_RELEASE_VERSION="$(getCheckstylePomVersionWithoutSnapshot)"
     echo "CS Release version: $CS_RELEASE_VERSION"
+
+    if [[ $CS_RELEASE_VERSION != *.0 ]]; then
+      echo "Next release version is bug fix '$CS_RELEASE_VERSION', we will bump second digit in it";
+      MAJOR=$(echo "$CS_RELEASE_VERSION" | cut -d. -f1)
+      MINOR=$(echo "$CS_RELEASE_VERSION" | cut -d. -f2)
+      PATCH=$(echo "$CS_RELEASE_VERSION" | cut -d. -f3)
+      CS_RELEASE_VERSION="$MAJOR""."$((MINOR+1))".0"
+      echo "Expected CS Release version after merge of target commit: $CS_RELEASE_VERSION"
+    fi
+
     echo "Grep for @since $CS_RELEASE_VERSION"
     grep "* @since $CS_RELEASE_VERSION" "$NEW_CHECK_FILE"
   else