Project main

.github/project.yml

@@ -1,4 +1,4 @@
 name: Quarkus QE Test Framework
 release:
-  current-version: 1.5.0.Beta9
-  next-version: 1.5.0.Beta10
+  current-version: 1.6.1.Beta2
+  next-version: 1.6.0.Beta4

.github/workflows/check-release-version.yml

@@ -29,30 +29,52 @@ jobs:
             current_release_minor_version=$(echo "$current_release" | cut -d"." -f2,2)
 
             # Check if can change minor version after creating new branch 
-            if [[ $current_release_minor_version == $next_prerelease_minor_version ]]; then
-              echo "Error: next LTS release branch is out, bump version to 1."$((next_prerelease_minor_version+1))".0.Beta1" 
+            if [[ "$current_release_minor_version" == "$next_prerelease_minor_version" ]]; then
+              echo "Error: next LTS release branch is out, bump version to 1."$(("$next_prerelease_minor_version" + 1))".0.Beta1" 
               exit 1;
-            else
-              prerelease_minor_version_bump=true 
+            elif [[ "$next_prerelease_beta_number" == 1 ]]; then
+              prerelease_minor_version_bump=true
             fi
 
-            if [[ $(("$current_release_minor_version" + 1)) != $next_prerelease_minor_version ]]; then
+            if [[ $(("$current_release_minor_version" + 1)) != "$next_prerelease_minor_version" ]]; then
               echo "Error: pre-releases should have minor version one upper than last release"
               exit 1;
             fi
 
-            if [[ $next_prerelease_patch_version != 0 ]]; then
+            if [[ "$next_prerelease_patch_version" != 0 || -z "$next_prerelease_beta_number" ]]; then
               echo "Error: new releases are not allowed from development branch, use .Beta\D+ qualifier"
               exit 1;
             fi
 
-            if [[ !($prerelease_minor_version_bump) && ($next_prerelease_beta_number != $(("$latest_prerelease_beta_number" + 1))) ]]; then
+            if (! "$prerelease_minor_version_bump") && [[ ("$next_prerelease_beta_number" != $(("$latest_prerelease_beta_number" + 1))) ]]; then
               echo "Error: pre-release version should go one by one as sequence"
               correct_version=$(echo "$latest_prerelease" | cut -d"." -f1,2,3)
-              correct_prerelease_number=$(($latest_prerelease_beta_number + 1))
+              correct_prerelease_number=$(("$latest_prerelease_beta_number" + 1))
               echo "After" $latest_prerelease "should go "$correct_version".Beta"$correct_prerelease_number
               exit 1;
             fi
+
+            echo "==================================="
+            cat .github/project.yml
+            echo "==================================="
+
+            project_current_base=$(echo "$next_prerelease" | grep -oP '^.*Beta')
+            echo "$project_current_base"
+            project_next_version=$(grep -E 'next-version:\s*' .github/project.yml | awk '{print $2}')
+            echo "$project_next_version"
+            project_next_base=$(echo "$project_next_version" | grep -oP '^.*Beta')
+            echo "$project_next_base"
+
+            project_current_beta_number="$next_prerelease_beta_number"
+            echo "$project_current_beta_number"
+            project_next_beta_number=$(echo "$project_next_version" | grep -oP 'Beta\K[0-9]+')
+            echo "$project_next_beta_number"
+
+
+            if [[ "$project_current_base" != "$project_next_base" ]] || [[ $(("$project_current_beta_number" + 1)) != "$project_next_beta_number" ]]; then
+              echo "The next-version in project.yaml is not valid. Next pre-release Beta version must be one upper that current"
+              exit 1;
+            fi  
           else 
             expected_release_version=$(echo "$GITHUB_BASE_REF" | sed 's/z/0/')
 
@@ -79,12 +101,12 @@ jobs:
             next_release_patch_version=$(echo "$next_release" | cut -d"." -f3,3)
             beta_tag_exists=$(echo "$next_release" | cut -d"." -f4,4 || true)
 
-            if [ -n $beta_tag_exists ]; then
+            if [ -n "$beta_tag_exists" ]; then
               echo "Releases cannot consist any qualifier after version"
               exit 1;
             fi
 
-            if [[ $branch_minor_version != $next_release_minor_version ]]; then
+            if [[ "$branch_minor_version" != "$next_release_minor_version" ]]; then
               echo "Error: minor versions cannot be changed"
               exit 1;
             fi
@@ -93,4 +115,15 @@ jobs:
               echo "Error: release patch versions should be bumped one by one as sequence"
               exit 1;
             fi
-          fi
+
+            project_next_version=$(grep -E 'next-version:\s*' .github/project.yml | awk '{print $2}')
+            project_next_base=$(echo "$project_next_version" | cut -d"." -f1,2)
+
+            project_current_patch_version="$next_release_patch_version"
+            project_next_patch_version=$(echo "$project_next_version" | awk -F. '{print $3}')
+
+            if [[ "$branch_version" != "$project_next_base" ]] || [[ $(("$project_current_patch_version" + 1)) != "$project_next_patch_version" ]]; then
+              echo "The next-version in project.yaml is not valid. Patch version of the next release must be one upper than the latest"
+              exit 1;
+            fi
+          fi