Fix git commit detection for Windows CI

Bithack · Dec 8, 2024 · 1f1917b · 1f1917b
1 parent 6b61fe8
commit 1f1917b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -31,6 +31,7 @@ jobs:
           release: false
           msystem: UCRT64
           pacboy: >-
+            git:
             gcc:p
             cmake:p
             ninja:p

diff --git a/cmake/Modules/GenerateGitVersion.cmake b/cmake/Modules/GenerateGitVersion.cmake
@@ -1,12 +1,12 @@
 
-set(VERSION_GITHASH "(none)")
-
 execute_process(COMMAND git rev-parse --short HEAD
 	WORKING_DIRECTORY "${GENERATE_VERSION_SOURCE_DIR}"
 	OUTPUT_VARIABLE VERSION_GITHASH OUTPUT_STRIP_TRAILING_WHITESPACE
 	ERROR_QUIET)
-if(VERSION_GITHASH)
-	set(VERSION_GITHASH "${VERSION_GITHASH}")
+if(NOT VERSION_GITHASH)
+	set(VERSION_GITHASH "(none)")
+else()
+	message(STATUS "*** Detected Git commit ${VERSION_GITHASH} ***")
 endif()
 
 configure_file(
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,7 @@ jobs: @@
               release: false
               msystem: UCRT64
               pacboy: >-
+                git:
                 gcc:p
                 cmake:p
                 ninja:p
@@ Expand Down @@