chore: Fix commit SHA for GitHub PRs

Author: mathbunnyru

.github/actions/cmake/action.yml

@@ -57,6 +57,11 @@ runs:
         STATIC: "${{ inputs.static == 'true' && 'ON' || 'OFF' }}"
         TIME_TRACE: "${{ inputs.time_trace == 'true' && 'ON' || 'OFF' }}"
         PACKAGE: "${{ inputs.package == 'true' && 'ON' || 'OFF' }}"
+        # GitHub creates merge commits for PRS, so we:
+        # - explicitly provide branch name
+        # - provide `github.event.pull_request.head.sha` to get the actual commit SHA of the PR branch.
+        GITHUB_REF_NAME: "${{ github.ref_name }}"
+        GITHUB_HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
       run: |
         cmake \
           -B "${BUILD_DIR}" \

cmake/ClioVersion.cmake

@@ -24,17 +24,23 @@ else ()
     OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
   )
 
-  set(GIT_COMMAND branch --show-current)
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BRANCH
-    OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
-  )
-
-  set(GIT_COMMAND rev-parse --short HEAD)
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE REV
-    OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
-  )
+  if (DEFINED ENV{GITHUB_REF_NAME})
+    # Please, see cmake action in .github/actions/ for details
+    set(BRANCH $ENV{GITHUB_REF_NAME})
+    set(REV $ENV{GITHUB_HEAD_SHA})
+  else ()
+    set(GIT_COMMAND branch --show-current)
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BRANCH
+      OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
+    )
+
+    set(GIT_COMMAND rev-parse --short HEAD)
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE REV
+      OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
+    )
+  endif ()
 
   set(CLIO_VERSION "${DATE}-${BRANCH}-${REV}")
   set(DOC_CLIO_VERSION "develop")