Skip to content

Update version calulation for interim build version #2493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soumeh01 merged 2 commits into from
Jun 11, 2026
Merged

Update version calulation for interim build version #2493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
110a080
Update version calulation for interim build version
soumeh01 Jun 2, 2026
49520d1
Merge branch 'main' into version-RC
soumeh01 Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/buildmgr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
paths:
- '.github/workflows/buildmgr.yml'
- '.github/matrix_includes_buildmgr.json'
- 'cmake/**'
- 'CMakeLists.txt'
- 'libs/crossplatform/**'
- 'libs/errlog/**'
Expand All @@ -23,6 +24,7 @@ on:
paths:
- '.github/workflows/buildmgr.yml'
- '.github/matrix_includes_buildmgr.json'
- 'cmake/**'
- 'CMakeLists.txt'
- 'libs/**'
- 'tools/buildmgr/**'
Expand Down Expand Up @@ -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'))
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/packchk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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**'
Expand All @@ -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**'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/packgen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
paths:
- '.github/workflows/packgen.yml'
- '.github/matrix_includes_packgen.json'
- 'cmake/**'
- 'CMakeLists.txt'
- 'libs/crossplatform/**'
- 'libs/rtefsutils/**'
Expand All @@ -20,6 +21,7 @@ on:
paths:
- '.github/workflows/packgen.yml'
- '.github/matrix_includes_packgen.json'
- 'cmake/**'
- 'CMakeLists.txt'
- 'libs/crossplatform/**'
- 'libs/rtefsutils/**'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/projmgr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
paths:
- '.github/workflows/projmgr.yml'
- '.github/matrix_includes_projmgr.json'
- 'cmake/**'
- 'CMakeLists.txt'
- 'libs/crossplatform/**'
- 'libs/rtefsutils/**'
Expand All @@ -22,6 +23,7 @@ on:
paths:
- '.github/workflows/projmgr.yml'
- '.github/matrix_includes_projmgr.json'
- 'cmake/**'
- 'CMakeLists.txt'
- 'libs/crossplatform/**'
- 'libs/rtefsutils/**'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/svdconv.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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**'
Expand All @@ -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**'
Expand Down
8 changes: 5 additions & 3 deletions cmake/ProjectVersionFromGitTag.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

Expand All @@ -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)
Expand Down
Loading