cmake: optional use git if found get branch and commit

.github/workflows/build_and_test.yml

@@ -17,11 +17,14 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      # Checkout is performed out of the container and doesn't match our user
+      - name: Fix checkout ownership
+        run: chown -R "$(id -u):$(id -g)" "$GITHUB_WORKSPACE"
+
       - name: Install dependencies
         run: |
           apk update && apk add cppcheck python3-dev
           python3 -m pip install cmake-format
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - uses: pre-commit/[email protected]
 
@@ -39,7 +42,7 @@ jobs:
           git diff --exit-code
 
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container: seladb/${{ matrix.image }}
     strategy:
       matrix:
@@ -72,6 +75,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      # Checkout is performed out of the container and doesn't match our user
+      - name: Fix checkout ownership
+        run: chown -R "$(id -u):$(id -g)" "$GITHUB_WORKSPACE"
+
       - name: Setup Intel Compiler variables
         if: contains(matrix.image, 'icpx')
         run: |
@@ -125,7 +132,7 @@ jobs:
           verbose: true
 
   dpdk:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container: seladb/${{ matrix.image }}
     strategy:
       matrix:
@@ -174,7 +181,7 @@ jobs:
         run: cd build_examples/tutorials_bin && ./Tutorial-HelloWorld
 
   pfring:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container: seladb/ubuntu2004-pfring
     strategy:
       matrix:

.github/workflows/codeql.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container: seladb/ubuntu2204
     permissions:
       security-events: write

.github/workflows/package.yml

@@ -10,7 +10,7 @@ env:
 
 jobs:
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container: seladb/${{ matrix.image }}
     strategy:
       matrix:
@@ -35,6 +35,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      # Checkout is performed out of the container and doesn't match our user
+      - name: Fix checkout ownership
+        run: chown -R "$(id -u):$(id -g)" "$GITHUB_WORKSPACE"
+
       - name: Setup Intel Compiler variables
         if: contains(matrix.image, 'icpx')
         run: |

CMakeLists.txt

@@ -203,8 +203,22 @@ if(PCAPPP_USE_DPDK)
 endif()
 
 # Git Commit and Branch
-add_compile_definitions(GIT_COMMIT="${GIT_HASH}")
-add_compile_definitions(GIT_BRANCH="${GIT_BRANCH}")
+find_package(Git)
+if(Git_FOUND)
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    OUTPUT_VARIABLE PCAPPP_GIT_COMMIT)
+  string(STRIP "${PCAPPP_GIT_COMMIT}" PCAPPP_GIT_COMMIT)
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    OUTPUT_VARIABLE PCAPPP_GIT_BRANCH)
+  string(STRIP "${PCAPPP_GIT_BRANCH}" PCAPPP_GIT_BRANCH)
+  message(STATUS "Building from commit:${PCAPPP_GIT_COMMIT} on branch:${PCAPPP_GIT_BRANCH}")
+  add_compile_definitions(GIT_COMMIT="${PCAPPP_GIT_COMMIT}")
+  add_compile_definitions(GIT_BRANCH="${PCAPPP_GIT_BRANCH}")
+endif()
 
 if(PCAPPP_USE_PF_RING)
   find_package(PF_RING)