Merge pull request #55 from MeteoSwiss/develop_vof

Improve the regex for the version
MeteoSwiss · Jan 21, 2022 · f08b80f · f08b80f
2 parents d6b865a + a79b793
commit f08b80f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.github/workflows/CI_check_version.yml b/.github/workflows/CI_check_version.yml
@@ -2,6 +2,10 @@
 #
 # It is triggered for any PR to the master branch.
 #
+# Warning: the code version must *absolutely* follow a semantic approach, i.e.:
+# 10.0.1, 10.0.2.dev0 is valid
+# 10.0, 10, is NOT valid !
+#
 # Copyright (c) 2022 fpavogt; [email protected]
 
 name: CI_check_version
@@ -43,9 +47,9 @@ jobs:
 
     - name: Check if the version was increased
       run: |
-        HEAD_VERSION="$(grep VERSION head_version.tmp | grep -o '[[:alnum:]]*\.[[:alnum:]]*\.[[:alnum:]]*')"
+        HEAD_VERSION="$(grep VERSION head_version.tmp | grep -o '[[:alnum:]]*\.[[:alnum:]]*\.[[:alnum:]]*\.\?[[:alnum:]]*')"
         echo "HEAD_VERSION:" $HEAD_VERSION
-        BASE_VERSION="$(grep VERSION base_version.tmp | grep -o '[[:alnum:]]*\.[[:alnum:]]*\.[[:alnum:]]*')"
+        BASE_VERSION="$(grep VERSION base_version.tmp | grep -o '[[:alnum:]]*\.[[:alnum:]]*\.[[:alnum:]]*\.\?[[:alnum:]]*')"
         echo "BASE_VERSION:" $BASE_VERSION
         python ./.github/workflows/check_version.py $HEAD_VERSION $BASE_VERSION
       shell: bash