Skip to content

Minor updates around versioning #1051

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
merged 3 commits into from
Jan 21, 2025
Merged

Minor updates around versioning #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0edc541
Order entries in libumf.def for 0.11 version
lukaszstolarczuk Jan 20, 2025
ade44f5
Update RELEASE_STEPS with dev tags on main
lukaszstolarczuk Jan 20, 2025
eb7c46d
[CMake] Allow '-devX' tags
lukaszstolarczuk Jan 21, 2025
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
5 changes: 5 additions & 0 deletions RELEASE_STEPS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ Do changes for a release:
- If stable branch for this release is required, create it:
- `git checkout -b v$VER.x`
- For some early versions (like `0.1.0`) we may omit creation of the branch
- For major/minor release, when release is done, add an extra "dev" tag on the `main` branch:
- `git tag -a -s -m "Development version $VERSION+1" v$VERSION+1-dev`
- for example, when `v0.1.0` is released, the dev tag would be `v0.2.0-dev`
- if needed, further in time, an extra dev tag can be introduced, e.g. `v0.2.0-dev1`
- This way, the `main` branch will introduce itself as the next version

## Publish changes

Expand Down
12 changes: 6 additions & 6 deletions cmake/helpers.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ function(set_version_variables)
return()
endif()

# v1.5.0-dev - we're on a development tag -> UMF ver: "1.5.0-dev"
string(REGEX MATCHALL "\^v([0-9]+\.[0-9]+\.[0-9]+)-dev\$" MATCHES
# v1.5.0-dev1 - we're on a development tag -> UMF ver: "1.5.0-dev1"
string(REGEX MATCHALL "\^v([0-9]+\.[0-9]+\.[0-9]+)-(dev[0-9]?)\$" MATCHES
${GIT_VERSION})
if(MATCHES)
set(UMF_VERSION
"${CMAKE_MATCH_1}-dev"
"${CMAKE_MATCH_1}-${CMAKE_MATCH_2}"
PARENT_SCOPE)
set(UMF_CMAKE_VERSION
"${CMAKE_MATCH_1}"
Expand Down Expand Up @@ -157,12 +157,12 @@ function(set_version_variables)
return()
endif()

# v1.5.0-dev-19-gb8f7a32 -> UMF ver: "1.5.0-dev.git19.gb8f7a32"
string(REGEX MATCHALL "v([0-9.]*)-dev-([0-9]*)-([0-9a-g]*)" MATCHES
# v1.5.0-dev2-19-gb8f7a32 -> UMF ver: "1.5.0-dev2.git19.gb8f7a32"
string(REGEX MATCHALL "v([0-9.]*)-(dev[0-9]?)-([0-9]*)-([0-9a-g]*)" MATCHES
${GIT_VERSION})
if(MATCHES)
set(UMF_VERSION
"${CMAKE_MATCH_1}-dev.git${CMAKE_MATCH_2}.${CMAKE_MATCH_3}"
"${CMAKE_MATCH_1}-${CMAKE_MATCH_2}.git${CMAKE_MATCH_3}.${CMAKE_MATCH_4}"
PARENT_SCOPE)
set(UMF_CMAKE_VERSION
"${CMAKE_MATCH_1}"
Expand Down
6 changes: 3 additions & 3 deletions src/libumf.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ EXPORTS
umfFileMemoryProviderParamsSetPath
umfFileMemoryProviderParamsSetProtection
umfFileMemoryProviderParamsSetVisibility
umfFixedMemoryProviderOps
umfFixedMemoryProviderParamsCreate
umfFixedMemoryProviderParamsDestroy
umfFree
umfGetIPCHandle
umfGetLastFailedMemoryProvider
Expand Down Expand Up @@ -121,4 +118,7 @@ EXPORTS
umfScalablePoolParamsSetGranularity
umfScalablePoolParamsSetKeepAllMemory
; Added in UMF_0.11
umfFixedMemoryProviderOps
umfFixedMemoryProviderParamsCreate
umfFixedMemoryProviderParamsDestroy
umfLevelZeroMemoryProviderParamsSetFreePolicy
Loading