From f3180fa1d670b62e7753a0c1ee5b4cc2fe9e1fc0 Mon Sep 17 00:00:00 2001
From: oliverpool <git@olivier.pfad.fr>
Date: Tue, 19 Mar 2024 10:36:45 +0100
Subject: [PATCH] [CI] FORGEJO_VERSION drop "g" prefix

Added by git describe, but is confusing
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7a19be9ffc..1c1524f95e 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,8 @@ STORED_VERSION=$(shell cat $(STORED_VERSION_FILE) 2>/dev/null)
 ifneq ($(STORED_VERSION),)
   FORGEJO_VERSION ?= $(STORED_VERSION)
 else
-  FORGEJO_VERSION ?= $(shell git describe --exclude '*-test' --tags --always | sed 's/^v//')+${GITEA_COMPATIBILITY}
+  # drop the "g" prefix prepended by git describe to the commit hash
+  FORGEJO_VERSION ?= $(shell git describe --exclude '*-test' --tags --always | sed 's/^v//' | sed 's/\-g/-/')+${GITEA_COMPATIBILITY}
 endif
 FORGEJO_VERSION_MAJOR=$(shell echo $(FORGEJO_VERSION) | sed -e 's/\..*//')