correct workflow package version

Author: d-biehl

.github/workflows/build-test-package-publish.yml

@@ -141,6 +141,7 @@ jobs:
           fetch-depth: 0
 
       - run: git describe --tag
+      - run: git describe --tag --long --first-parent --match "v[0-9]*"
 
       - name: setup python environment
         id: setup-python
@@ -180,10 +181,11 @@ jobs:
         run: npm install --also=dev
 
       - name: update versions from git
+        if: ${{ !startsWith( github.ref, 'refs/tags/v') }}
         run: poetry run python ./scripts/update_git_versions.py
 
       - name: update doc links
-        if: ${{ !startsWith( github.ref, 'refs/tags/v') }}
+        if: ${{ startsWith( github.ref, 'refs/tags/v') }}
         run: poetry run npm run update-doc-links
 
       - name: package

scripts/tools.py

@@ -15,11 +15,15 @@ class GitDescribeVersion(NamedTuple):
 def get_current_version_from_git() -> Version:
     repo = Repo(Path.cwd())
 
-    git_version = GitDescribeVersion(*repo.git.describe("--long", "--match", "v[0-9]*").split("-"))
+    git_version = GitDescribeVersion(
+        *repo.git.describe("--tag", "--long", "--first-parent", "--match", "v[0-9]*").split("-")
+    )
+
     version = Version(git_version.version[1:])
     if git_version.commits is not None and git_version.commits != "0":
         version = version.next_patch()
         version.prerelease = ("dev", git_version.commits)
+
     return version