Move ldmx-sw versioning to dedicated file (#1546)

* Move ldmx-sw versioning to dedicated file --------- Co-authored-by: Tom Eichlersmith <[email protected]>
LDMX-Software · Jan 29, 2025 · 0783bd7 · 0783bd7
1 parent 5de33da
commit 0783bd7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/actions/common.sh b/.github/actions/common.sh
@@ -22,7 +22,7 @@
 
 # Print the gold label
 ldmx_gold_label() {
-  cat ${LDMX_GOLD_LABEL_FILE}
+  cat ${LDMX_VERSION_FILE}
 }
 
 # container running command
@@ -66,9 +66,9 @@ warn() {
 }
 
 start_group Deduce Common Environment Variables
-export LDMX_GOLD_LABEL_FILE=${GITHUB_WORKSPACE}/.github/actions/validate/gold_label
 export LDMX_BASE=$(cd ${GITHUB_WORKSPACE}/../ && pwd)
-echo "LDMX_GOLD_LABEL_FILE=${LDMX_GOLD_LABEL_FILE}"
+export LDMX_VERSION_FILE=${LDMX_BASE}/ldmx-sw/VERSION
+echo "LDMX_VERSION_FILE=${LDMX_VERSION_FILE}"
 echo "LDMX_BASE=${LDMX_BASE}"
 end_group
 
diff --git a/.github/workflows/generate_pr_gold.yml b/.github/workflows/generate_pr_gold.yml
@@ -101,7 +101,7 @@ jobs:
         source ${GITHUB_WORKSPACE}/.github/actions/common.sh
         start_group Update Gold Label
         echo "Old Label: $(ldmx_gold_label)"
-        echo "${GITHUB_REF##refs/tags/}" > ${LDMX_GOLD_LABEL_FILE}
+        echo "${GITHUB_REF##refs/tags/}" > ${LDMX_VERSION_FILE}
         echo "New Label: $(ldmx_gold_label)"
         git add ${LDMX_GOLD_LABEL_FILE}
         end_group

diff --git a/.github/workflows/pr_validation.yml b/.github/workflows/pr_validation.yml
@@ -35,7 +35,7 @@ jobs:
       shell: bash
 
     - name: Git Gold Histograms from trunk
-      run: git checkout origin/trunk -- .github/validation_samples/*/gold.root .github/actions/validate/gold_label
+      run: git checkout origin/trunk -- .github/validation_samples/*/gold.root VERSION
       shell: bash
 
     - name: Package ldmx-sw Into Artifact

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,10 @@ if ("${srcdir}" STREQUAL "${bindir}")
 endif()
 
 # Set the project name
-project(LDMX_SW VERSION 3.1.1
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/VERSION LDMXSW_VERSION)
+string(STRIP "${LDMXSW_VERSION}" LDMXSW_VERSION)
+string(REGEX REPLACE "^v" "" LDMXSW_VERSION_NUM "${LDMXSW_VERSION}") 
+project(LDMX_SW VERSION ${LDMXSW_VERSION_NUM} 
                 DESCRIPTION "The Light Dark Matter eXperiment simulation and reconstruction framework." 
                 LANGUAGES CXX    
 )

diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt
@@ -65,9 +65,6 @@ else()
 endif()
 message(STATUS "Deduced git SHA: ${GIT_SHA1}")
 
-# Include ldmx-sw version in the Run Header
-file(READ ${PROJECT_SOURCE_DIR}/../.github/actions/validate/gold_label LDMXSW_VERSION)
-string(STRIP "${LDMXSW_VERSION}" LDMXSW_VERSION)
 
 # Copies the file 'Version.h.in', substitutes the value of GIT_SHA1 and writes
 # it out to Version.h.

diff --git a/.github/actions/validate/gold_label → VERSION b/.github/actions/validate/gold_label → VERSION