From: Joel Rosdahl <joel@rosdahl.net>
Date: Mon, 17 Apr 2023 16:08:24 +0000 (+0200)
Subject: fix: Find Ccache version from lightweight Git tag
X-Git-Tag: v4.8.1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65886dc168240ddbc60920c812458a70130191c3;p=thirdparty%2Fccache.git

fix: Find Ccache version from lightweight Git tag

Ccache calculates its version from a matching Git tag by using the "git
describe" command, which only considers annotated tags. All ccache tags
are annotated. However, when running a GitHub action job for a tag the
local Git repository is (at least by default) a shallow clone with the
tag being converted to a lightweight tag. This makes "git describe" not
see the tag.

Fix this by adding --tags to "git describe" to make it consider
lightweight tags as well.

Fixes #1270.
---

diff --git a/cmake/CcacheVersion.cmake b/cmake/CcacheVersion.cmake
index 3d373bfaf..34e7c9656 100644
--- a/cmake/CcacheVersion.cmake
+++ b/cmake/CcacheVersion.cmake
@@ -54,7 +54,7 @@ elseif(EXISTS "${CMAKE_SOURCE_DIR}/.git")
         ERROR_VARIABLE git_stderr ERROR_STRIP_TRAILING_WHITESPACE)
     endmacro()
 
-    git(describe --abbrev=8 --dirty)
+    git(describe --tags --abbrev=8 --dirty)
     if(git_stdout MATCHES "^v([^-]+)(-dirty)?$")
       set(CCACHE_VERSION "${CMAKE_MATCH_1}")
       if(NOT "${CMAKE_MATCH_2}" STREQUAL "")