Merge pull request #592 from TriBITSPub/gha-fix-build-doc-tests

Fix broken build docs tests run with GitHub Actions
TriBITSPub · Jul 26, 2023 · 8c1874c · 8c1874c
2 parents 95fafb7 + 928e562
commit 8c1874c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/tribits_testing.yml b/.github/workflows/tribits_testing.yml
@@ -74,6 +74,12 @@ jobs:
           which ${{ matrix.config.cxx }}
           ${{ matrix.config.cxx }} --version
           if [ "${{ matrix.config.fc }}" = "" ]; then echo "No fortran compiler"; else echo "Checking gfortran path and version" && which ${{ matrix.config.fc }} && ${{ matrix.config.fc }} --version; fi
+      - name: Fetch repo tags
+        run: |
+          echo "Running: git fetch origin 'refs/tags/*:refs/tags/*'"
+          git fetch origin 'refs/tags/*:refs/tags/*'
+          echo "Running: git tag"
+          git tag
       - name: Run configure, build, test, and submit to CDash
         run: |
           cd ..

diff --git a/tribits/doc/utils/gen_doc_utils.sh b/tribits/doc/utils/gen_doc_utils.sh
@@ -51,7 +51,8 @@ function generate_git_version_file {
     echo
     echo "Generating git version"
     echo
-    echo `git describe --match="$_TRIBITS_TAG_PREFIX*"` > TribitsGitVersion.txt
+    git describe --always --match="$_TRIBITS_TAG_PREFIX*" > TribitsGitVersion.txt || \
+      echo "$_TRIBITS_TAG_PREFIX.{Unknown version}" > TribitsGitVersion.txt
   else
     echo "$_TRIBITS_TAG_PREFIX.{Unknown version}" > TribitsGitVersion.txt
   fi