Skip to content

Commit 204d335

Browse files
committed
fix: release candidate version string
1 parent ae29c3d commit 204d335

3 files changed

Lines changed: 12 additions & 2 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ project(Iceberg
2828
DESCRIPTION "Iceberg C++ Project"
2929
LANGUAGES CXX)
3030

31-
set(ICEBERG_VERSION_SUFFIX "-SNAPSHOT")
32-
set(ICEBERG_VERSION_STRING "${PROJECT_VERSION}${ICEBERG_VERSION_SUFFIX}")
31+
set(ICEBERG_VERSION_STRING "${PROJECT_VERSION}")
3332
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/iceberg/version.h.in"
3433
"${CMAKE_BINARY_DIR}/src/iceberg/version.h")
3534

‎dev/release/verify_rc.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,16 @@ test_source_distribution() {
124124
-DICEBERG_BUILD_SHARED=ON \
125125
--compile-no-warning-as-error
126126

127+
version_header="build/src/iceberg/version.h"
128+
if ! grep -Fq "#define ICEBERG_VERSION_STRING \"${VERSION}\"" "${version_header}"; then
129+
echo "Unexpected ICEBERG_VERSION_STRING in ${version_header}; expected ${VERSION}."
130+
exit 1
131+
fi
132+
if grep -Fq "SNAPSHOT" "${version_header}"; then
133+
echo "Release candidate version must not contain SNAPSHOT."
134+
exit 1
135+
fi
136+
127137
# Build
128138
cmake --build build --parallel $(nproc || sysctl -n hw.ncpu || echo 4)
129139

‎src/iceberg/meson.build‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ conf_data.set('PROJECT_VERSION_MAJOR', ver_major)
2929
conf_data.set('PROJECT_VERSION_MINOR', ver_minor)
3030
conf_data.set('PROJECT_VERSION_PATCH', ver_patch)
3131
conf_data.set('PROJECT_VERSION', version)
32+
conf_data.set('ICEBERG_VERSION_STRING', version)
3233
conf_data.set('PROJECT_NAME', meson.project_name())
3334
configure_file(
3435
input: 'version.h.in',

0 commit comments

Comments
 (0)