🐛 GitHub Actions: Try to fix setuptools + git tags

qurator-spk · Aug 1, 2023 · 1735872 · 1735872
1 parent d87fe4e
commit 1735872
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/release-check-version-tag b/.github/workflows/release-check-version-tag
@@ -3,7 +3,7 @@
 # We call setuptools.setup() here as we may rely on setuptools to interpret
 # a dynamic version field. (Reading pyproject.toml is not enough in that case.)
 expected_git_tag="v$(python -c 'from setuptools import setup; setup()' --version)"
-actual_git_tag="$(git describe)"
+actual_git_tag="$(git describe --tags)"
 
 if [[ "$expected_git_tag" == "$actual_git_tag" ]]; then
   echo "OK: Python package version $expected_git_tag matches git tag"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Check git tag vs package version
-        run: python3 -m pip install --upgrade setuptools && git fetch --tags & git fetch --tags && .github/workflows/release-check-version-tag
+        run: python3 -m pip install --upgrade setuptools && .github/workflows/release-check-version-tag
       - name: Build package
         run: python3 -m pip install --upgrade build && python3 -m build
       - name: Upload dist