Update version calulation for interim build version (#2493)

## Fixes
- Arm-Debug/mcu-assets-dashboard#120

## Checklist
<!-- Put an `x` in the boxes. All tasks must be completed and boxes
checked before merging. -->
- [x] 🤖 This change is covered by unit tests (if applicable).
- [x] 🤹 Manual testing has been performed (if necessary).
- [x] 🛡️ Security impacts have been considered (if relevant).
- [ ] 📖 Documentation updates are complete (if required).
- [ ] 🧠 Third-party dependencies and TPIP updated (if required).

Author: soumeh01

.github/workflows/buildmgr.yml

@@ -5,6 +5,7 @@ on:
     paths:
       - '.github/workflows/buildmgr.yml'
       - '.github/matrix_includes_buildmgr.json'
+      - 'cmake/**'
       - 'CMakeLists.txt'
       - 'libs/crossplatform/**'
       - 'libs/errlog/**'
@@ -23,6 +24,7 @@ on:
     paths:
       - '.github/workflows/buildmgr.yml'
       - '.github/matrix_includes_buildmgr.json'
+      - 'cmake/**'
       - 'CMakeLists.txt'
       - 'libs/**'
       - 'tools/buildmgr/**'
@@ -91,7 +93,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install binutils-aarch64-linux-gnu
 
-      - name: Strip projmgr release binary
+      - name: Strip cbuildgen release binary
         if: |
           github.event_name == 'release' &&
           (startsWith(matrix.runs_on, 'macos') || startsWith(matrix.runs_on, 'ubuntu'))

.github/workflows/packchk.yml

@@ -8,6 +8,7 @@ on:
       - '.github/workflows/packchk.yml'
       - '.github/workflows/unit_test_results.yml'
       - '.github/matrix_includes_packchk.json'
+      - 'cmake/**'
       - 'CMakeLists.txt'
       - 'tools/packchk/**'
       - 'libs/xml**'
@@ -23,6 +24,7 @@ on:
       - '.github/workflows/packchk.yml'
       - '.github/workflows/unit_test_results.yml'
       - '.github/matrix_includes_packchk.json'
+      - 'cmake/**'
       - 'CMakeLists.txt'
       - 'tools/packchk/**'
       - 'libs/xml**'

.github/workflows/packgen.yml

@@ -7,6 +7,7 @@ on:
     paths:
       - '.github/workflows/packgen.yml'
       - '.github/matrix_includes_packgen.json'
+      - 'cmake/**'
       - 'CMakeLists.txt'
       - 'libs/crossplatform/**'
       - 'libs/rtefsutils/**'
@@ -20,6 +21,7 @@ on:
     paths:
       - '.github/workflows/packgen.yml'
       - '.github/matrix_includes_packgen.json'
+      - 'cmake/**'
       - 'CMakeLists.txt'
       - 'libs/crossplatform/**'
       - 'libs/rtefsutils/**'

.github/workflows/projmgr.yml

@@ -7,6 +7,7 @@ on:
     paths:
       - '.github/workflows/projmgr.yml'
       - '.github/matrix_includes_projmgr.json'
+      - 'cmake/**'
       - 'CMakeLists.txt'
       - 'libs/crossplatform/**'
       - 'libs/rtefsutils/**'
@@ -22,6 +23,7 @@ on:
     paths:
       - '.github/workflows/projmgr.yml'
       - '.github/matrix_includes_projmgr.json'
+      - 'cmake/**'
       - 'CMakeLists.txt'
       - 'libs/crossplatform/**'
       - 'libs/rtefsutils/**'

.github/workflows/svdconv.yml

@@ -10,6 +10,7 @@ on:
       - '.github/workflows/svdconv.yml'
       - '.github/workflows/unit_test_results.yml'
       - '.github/matrix_includes_svdconv.json'
+      - 'cmake/**'
       - 'CMakeLists.txt'
       - 'tools/svdconv/**'
       - 'libs/xml**'
@@ -20,6 +21,7 @@ on:
       - '.github/workflows/svdconv.yml'
       - '.github/workflows/unit_test_results.yml'
       - '.github/matrix_includes_svdconv.json'
+      - 'cmake/**'
       - 'CMakeLists.txt'
       - 'tools/svdconv/**'
       - 'libs/xml**'

cmake/ProjectVersionFromGitTag.cmake

@@ -38,6 +38,7 @@ function(get_version_from_git_tag _prefix)
 
         if(DESCRIBE MATCHES "^${_prefix}[0-9]+\\.[0-9]+(\\.[0-9]+)?(-[a-zA-Z][a-zA-Z0-9-\\.]*)(-[0-9]+-g[0-9a-f]+)?$")
             # Version with PreRelease info
+            math(EXPR VERSION_PATCH_FULL "${VERSION_PATCH} + 1")
             string(REGEX REPLACE "(-[0-9]+)(-g[0-9a-f]+)?$" "" TAG_SEGMENT_STR "${DESCRIBE}")
             string(REGEX REPLACE "^${_prefix}[0-9]+\\.[0-9]+\\.[0-9]+-(.*)" "\\1" VERSION_PRE_RELEASE "${TAG_SEGMENT_STR}")
 
@@ -49,19 +50,20 @@ function(get_version_from_git_tag _prefix)
 
             if(DEFINED VERSION_HASH)
                 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_TWEAK}")
-                set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_PRE_RELEASE}+p${VERSION_TWEAK}-g${VERSION_HASH}")
+                set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH_FULL}-${VERSION_PRE_RELEASE}+p${VERSION_TWEAK}-g${VERSION_HASH}")
             else()
                 get_git_head_revision(VERSION_REF VERSION_HASH)
                 string(SUBSTRING "${VERSION_HASH}" 0 7  VERSION_HASH)
                 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-                set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_PRE_RELEASE}")
+                set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH_FULL}-${VERSION_PRE_RELEASE}")
             endif()
 
         elseif(DESCRIBE MATCHES "^${_prefix}[0-9]+\\.[0-9]+\\.[0-9]+-[0-9]+-g([0-9a-f]+).*")
+            math(EXPR VERSION_PATCH_FULL "${VERSION_PATCH} + 1")
             string(REGEX REPLACE "^${_prefix}[0-9]+\\.[0-9]+\\.[0-9]+-([0-9]+).*" "\\1" VERSION_TWEAK "${DESCRIBE}")
             string(REGEX REPLACE "^${_prefix}[0-9]+\\.[0-9]+\\.[0-9]+-[0-9]+-g([0-9a-f]+).*" "\\1" VERSION_HASH "${DESCRIBE}")
             set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_TWEAK}")
-            set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}+p${VERSION_TWEAK}-g${VERSION_HASH}")
+            set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH_FULL}+p${VERSION_TWEAK}-g${VERSION_HASH}")
         else()
             get_git_head_revision(VERSION_REF VERSION_HASH)
             string(SUBSTRING "${VERSION_HASH}" 0 7  VERSION_HASH)