adding sha to all builds (flameshot-org#4190)

Author: borgmanJeremy

.github/workflows/Linux-arm-pack.yml

@@ -103,6 +103,8 @@ jobs:
           # echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
           echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV
           echo "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
+
 
       - name: Get packpack tool
         uses: actions/checkout@v4

.github/workflows/Linux-pack.yml

@@ -94,6 +94,7 @@ jobs:
           # echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
           echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV
           echo "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Get packpack tool
         uses: actions/checkout@v4
@@ -184,6 +185,7 @@ jobs:
           # echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
           echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV
           echo "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Get packpack tool
         uses: actions/checkout@v4
@@ -311,6 +313,7 @@ jobs:
           # echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
           echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV
           echo "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Install Dependencies
         run: |
@@ -404,6 +407,7 @@ jobs:
           # echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
           echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV
           echo "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Setup flatpak
         run: |
@@ -476,6 +480,7 @@ jobs:
           # echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
           echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV
           echo "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Packaging snap
         uses: snapcore/action-build@v1

.github/workflows/MacOS-pack.yml

@@ -72,6 +72,7 @@ jobs:
           # echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
           echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV
           echo "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Install Qt
         run: brew install qt@6 cmake

.github/workflows/Windows-pack.yml

@@ -89,6 +89,7 @@ jobs:
           # echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
           echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV
           echo "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Restore from cache and run vcpkg
         uses: lukka/run-vcpkg@v11

src/CMakeLists.txt

@@ -286,16 +286,22 @@ endif()
 message("Flameshot predefined color palette large: " ${FLAMESHOT_PREDEFINED_COLOR_PALETTE_LARGE})
 target_compile_definitions(flameshot PRIVATE PREDEFINED_COLOR_PALETTE_LARGE=${FLAMESHOT_PREDEFINED_COLOR_PALETTE_LARGE})
 
-find_package (Git)
-if (GIT_FOUND)
-    message("git found: ${GIT_EXECUTABLE} in version     ${GIT_VERSION_STRING}")
-    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD OUTPUT_VARIABLE FLAMESHOT_GIT_HASH)
-    string(REGEX REPLACE "\r*\n$" "" FLAMESHOT_GIT_HASH "${FLAMESHOT_GIT_HASH}")
+if( DEFINED ENV{GIT_HASH})
+    message("Using provided git_commit_hash: $ENV{GIT_HASH}")
+    set(FLAMESHOT_GIT_HASH $ENV{GIT_HASH})
     target_compile_definitions(flameshot PRIVATE FLAMESHOT_GIT_HASH="${FLAMESHOT_GIT_HASH}")
-    message("FLAMESHOT_GIT_HASH: ${FLAMESHOT_GIT_HASH}")
 else()
-    target_compile_definitions(flameshot PRIVATE FLAMESHOT_GIT_HASH="-")
-    message("git command is not found")
+    find_package (Git)
+    if (GIT_FOUND)
+        message("git found: ${GIT_EXECUTABLE} in version     ${GIT_VERSION_STRING}")
+        execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD OUTPUT_VARIABLE FLAMESHOT_GIT_HASH)
+        string(REGEX REPLACE "\r*\n$" "" FLAMESHOT_GIT_HASH "${FLAMESHOT_GIT_HASH}")
+        target_compile_definitions(flameshot PRIVATE FLAMESHOT_GIT_HASH="${FLAMESHOT_GIT_HASH}")
+        message("FLAMESHOT_GIT_HASH: ${FLAMESHOT_GIT_HASH}")
+    else()
+        target_compile_definitions(flameshot PRIVATE FLAMESHOT_GIT_HASH="-")
+        message("git command is not found")
+    endif ()
 endif ()
 target_compile_definitions(flameshot PRIVATE APP_PREFIX="${CMAKE_INSTALL_PREFIX}")
 target_compile_definitions(flameshot PRIVATE APP_VERSION="v${PROJECT_VERSION}")