build: correct version even if unannotated tag (#1792)

* build: correct version even if unannotated tag * CI: force correct git describe
TomographicImaging · Apr 25, 2024 · ae94a9c · ae94a9c
1 parent e51e2ab
commit ae94a9c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -109,7 +109,10 @@ jobs:
         numpy-version: [1.25]
     steps:
     - uses: actions/checkout@v4
-      with: {fetch-depth: 0, submodules: recursive}
+      with:
+        fetch-depth: 0
+        submodules: recursive
+        ref: ${{ github.event.pull_request.head.sha || github.ref }} # fix SHA
     - uses: conda-incubator/setup-miniconda@v3
       with:
         python-version: ${{ matrix.python-version }}
@@ -130,7 +133,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-      with: {fetch-depth: 0, submodules: recursive}
+      with:
+        fetch-depth: 0
+        submodules: recursive
+        ref: ${{ github.event.pull_request.head.sha || github.ref }} # fix SHA
     - uses: conda-incubator/setup-miniconda@v3
       with: {python-version: 3.11}
     - name: install dependencies

diff --git a/Wrappers/Python/CMake/parse_git_describe.py b/Wrappers/Python/CMake/parse_git_describe.py
@@ -21,7 +21,7 @@
 git_executable = os.path.abspath(sys.argv[1])
 
 pattern = re.compile('v([0-9]*)\.([0-9]*)(\.*)([0-9]*)')
-git_describe_string = subprocess.check_output(f'"{git_executable}" describe', shell=True).decode("utf-8").rstrip()
+git_describe_string = subprocess.check_output(f'"{git_executable}" describe --tags', shell=True).decode("utf-8").rstrip()
 v = git_describe_string.split('-')
 if len(v) == 3:
     git_version_string, git_commit_number, git_hash = git_describe_string.split('-')