Fix git version detection in CI

Author: Su5eD

.github/workflows/docker-publish.yml

@@ -19,9 +19,13 @@ jobs:
       id-token: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
+
+      - name: Git describe
+        id: ghd
+        uses: proudust/gh-describe@v2
         with:
-          fetch-tags: true
+          match: 'v*'
 
       - name: Install cosign
         uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
@@ -49,6 +53,11 @@ jobs:
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           context: .
+          build-args: |
+            "MANUAL_VERSIONING=true"
+            "GIT_VERSION=${{ steps.ghd.outputs.describe }}"
+            "GIT_HASH_FULL=${{ steps.ghd.outputs.sha }}"
+            "GIT_HASH_SHORT=${{ steps.ghd.outputs.short-sha }}"
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,5 +1,14 @@
 FROM debian:sid-slim AS build
 
+ARG MANUAL_VERSIONING=false
+ENV MANUAL_VERSIONING=${MANUAL_VERSIONING}
+ARG GIT_VERSION=0.0.0
+ENV GIT_VERSION=${GIT_VERSION}
+ARG GIT_HASH_FULL=unknown
+ENV GIT_HASH_FULL=${GIT_HASH_FULL}
+ARG GIT_HASH_SHORT=unknown
+ENV GIT_HASH_SHORT=${GIT_HASH_SHORT}
+
 WORKDIR /build
 
 # Install dependencies
@@ -25,7 +34,6 @@ RUN git clone https://github.com/drogonframework/drogon && cd drogon && git subm
 # Build app
 WORKDIR /build/src
 
-COPY $PWD/.git /build/src/.git
 COPY $PWD/builtin /build/src/builtin
 COPY $PWD/modules /build/src/modules
 COPY $PWD/src /build/src/src

modules/GitVersionDetect.cmake

@@ -34,7 +34,13 @@ This will define the following variables:
 find_package(Git)
 
 # Check if a git executable was found
-if(GIT_EXECUTABLE)
+if (DEFINED ENV{MANUAL_VERSIONING} AND "$ENV{MANUAL_VERSIONING}" STREQUAL "true")
+    message("Using manual Git versioning")
+
+    string(REGEX REPLACE "^v" "" GITVERSIONDETECT_VERSION "$ENV{GIT_VERSION}")
+    set(GIT_HASH_FULL "$ENV{GIT_HASH_FULL}")
+    set(GIT_HASH_SHORT "$ENV{GIT_HASH_SHORT}")
+elseif(GIT_EXECUTABLE)
     # Generate a git-describe version string from Git repository tags
     execute_process(
             COMMAND ${GIT_EXECUTABLE} describe --tags --dirty --match "v*"

src/api/v1/game.cc

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include <content/recipe/recipe_parser.h>
+#include <service/content/recipe/recipe_parser.h>
 #include <database/resolved_db.h>
 #include <service/system/lang.h>
 

src/service/CMakeLists.txt

@@ -7,7 +7,7 @@ read_and_escape_schema("../../builtin/minecraft/recipe_type/stonecutting.json" S
 read_and_escape_schema("../../builtin/minecraft/recipe_type/smithing_transform.json" SMITHING_TRANSFORM)
 
 configure_file(content/recipe/builtin_recipe_type.h.in
-        ${CMAKE_CURRENT_BINARY_DIR}/content/recipe/builtin_recipe_type.h
+        ${CMAKE_CURRENT_BINARY_DIR}/service/content/recipe/builtin_recipe_type.h
         @ONLY
 )
 

src/service/content/recipe/recipe_builtin.cc

@@ -1,6 +1,6 @@
 #include "recipe_builtin.h"
 
-#include <content/builtin_recipe_type.h>
+#include <service/content/recipe/builtin_recipe_type.h>
 #include <database/database.h>
 #include <drogon/drogon.h>
 #include <schemas/schemas.h>

src/service/resolved.cc

@@ -11,7 +11,7 @@
 #include <filesystem>
 #include <unordered_map>
 
-#include <content/recipe/recipe_resolver.h>
+#include <service/content/recipe/recipe_resolver.h>
 #include <fmt/args.h>
 #include <models/Item.h>
 #include <models/ProjectItem.h>