diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 9d428a87..e33aa792 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -336,6 +336,9 @@ jobs: steps: - name: Checkout repo uses: actions/checkout@v4 + with: + fetch-depth: 0 + fetch-tags: true - name: Setup Cygwin uses: cygwin/cygwin-install-action@v4 with: @@ -363,6 +366,9 @@ jobs: steps: - name: Checkout repo uses: actions/checkout@v4 + with: + fetch-depth: 0 + fetch-tags: true - name: Build & test using CMake on FreeBSD uses: vmactions/freebsd-vm@v1 with: diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a277c1e..24b6d087 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ endif() find_program(GIT git) if(GIT) - execute_process(COMMAND ${GIT} --git-dir=.git describe --tags --dirty --always + execute_process(COMMAND ${GIT} --git-dir=.git -c safe.directory='*' describe --tags --dirty --always WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_REV OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) diff --git a/Makefile b/Makefile index cfdc020d..611b9a54 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ PNGLDFLAGS := `${PKG_CONFIG} --libs-only-L libpng` PNGLDLIBS := `${PKG_CONFIG} --libs-only-l libpng` # Note: if this comes up empty, `version.cpp` will automatically fall back to last release number -VERSION_STRING := `git --git-dir=.git describe --tags --dirty --always 2>/dev/null` +VERSION_STRING := `git --git-dir=.git -c safe.directory='*' describe --tags --dirty --always 2>/dev/null` WARNFLAGS := -Wall -pedantic -Wno-unknown-warning-option -Wno-gnu-zero-variadic-macro-arguments @@ -265,4 +265,4 @@ wine-shim: dist: $Qgit ls-files | sed s~^~$${PWD##*/}/~ \ - | tar -czf rgbds-`git describe --tags | cut -c 2-`.tar.gz -C .. -T - + | tar -czf rgbds-`git -c safe.directory='*' describe --tags | cut -c 2-`.tar.gz -C .. -T - diff --git a/test/asm/test.sh b/test/asm/test.sh index 17353bf5..89e67773 100755 --- a/test/asm/test.sh +++ b/test/asm/test.sh @@ -45,7 +45,7 @@ tryCmp () { } # Add the version constants test, outputting the closest tag to the HEAD -if git describe --tags --abbrev=0 >version.out; then +if git -c safe.directory='*' describe --tags --abbrev=0 >version.out; then $RGBASM --version >>version.out cat >version.asm <