Merge branch 'dev41' into unicode

starg2 · Sep 25, 2022 · 3d4a68a · 3d4a68a
2 parents 52922c0 + 142f0cb
commit 3d4a68a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,8 +36,13 @@ jobs:
  path: timidity41
  fetch-depth: 0
 
+ - name: Fetch tags
+ run: git fetch --tags --force
+ shell: bash
+ working-directory: timidity41
+
  - name: Run "git describe"
- run: echo "TIM41_DESCRIBE=$(git describe --first-parent --tags)" >> $GITHUB_ENV
+ run: echo "TIM41_DESCRIBE=$(git describe --first-parent)" >> $GITHUB_ENV
  shell: bash
  working-directory: timidity41
 

diff --git a/WriteVersion.cmake b/WriteVersion.cmake
@@ -1,6 +1,6 @@
 
 execute_process(
- COMMAND "${GIT_EXECUTABLE}" describe --first-parent --tags
+ COMMAND "${GIT_EXECUTABLE}" describe --first-parent
  OUTPUT_VARIABLE gitDescribeResult
  OUTPUT_STRIP_TRAILING_WHITESPACE
 )