From 18f3e1d63e2be4ac64bec2054e6a79b915b3987e Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 20 Feb 2026 19:31:01 -0700 Subject: [PATCH 1/2] cpack: derive package version from release tag file when present Set CPACK_PACKAGE_VERSION from .github/release-tag.json (tag) when the file exists and parses cleanly; otherwise fall back to v${PROJECT_VERSION}. Also make CPACK_PACKAGE_FILE_NAME use the derived package version for consistent artifact naming. --- CMakeLists.txt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a0a12f..0d807a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,11 +3,24 @@ if(NOT DEFINED CMAKE_INSTALL_PREFIX) # NOTE: CMAKE_INSTALL_PREFIX must be set before project() to take effect set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/dist CACHE PATH "Install path prefix, prepended onto install directories.") endif() -project(Dockerfile.vim VERSION 21.09.06.2) # date-of-master-branch-commit.revision +project(Dockerfile.vim VERSION 21.09.06) # date-of-master-branch-commit set(_dirs ftdetect ftplugin indent snippets syntax) install(DIRECTORY ${_dirs} DESTINATION .) set(CPACK_GENERATOR RPM) set(CPACK_RPM_PACKAGE_ARCHITECTURE "noarch") set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/share/vim/vimfiles") -set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-v${PROJECT_VERSION}) +set(_cpack_package_version "v${PROJECT_VERSION}") +set(_release_tag_file "${CMAKE_CURRENT_SOURCE_DIR}/.github/release-tag.json") +if(EXISTS "${_release_tag_file}") + file(READ "${_release_tag_file}" _release_tag_contents) + string(JSON _release_tag ERROR_VARIABLE _release_tag_err GET "${_release_tag_contents}" tag) + if(NOT _release_tag_err) + string(STRIP "${_release_tag}" _release_tag) + if(NOT _release_tag STREQUAL "") + set(_cpack_package_version "${_release_tag}") + endif() + endif() +endif() +set(CPACK_PACKAGE_VERSION "${_cpack_package_version}") +set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${_cpack_package_version}) include(CPack) From 8908247783f2850b1aee11ee83f43d7eeb8a5f49 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 20 Feb 2026 19:32:28 -0700 Subject: [PATCH 2/2] release-tag intent: xpv21.09.06.4 --- .github/release-tag.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/release-tag.json b/.github/release-tag.json index 7947c6b..d2ef811 100644 --- a/.github/release-tag.json +++ b/.github/release-tag.json @@ -1,4 +1,4 @@ { - "message": "xpro version 21.09.06.3 tag", - "tag": "xpv21.09.06.3" + "message": "xpro version 21.09.06.4 tag", + "tag": "xpv21.09.06.4" }