Merge pull request #385 from FAIRmat-NFDI/git-reset-in-build-step

Git reset in build step

.github/workflows/check_nexus_version.yml

@@ -17,8 +17,8 @@ jobs:
           git submodule update --init --recursive --jobs=4
           git submodule foreach --recursive 'git fetch --tags'
           cd src/pynxtools/definitions
-          git describe --dirty --tags --long --match "*[0-9]*" > ../nexus-ref.txt
+          printf "%s" "$(git describe --dirty --tags --long --abbrev=8 --match '*[0-9]*')" > ../nexus-ref.txt
           cd ../
       - name: Diff
         run: |
-          diff -w src/pynxtools/nexus-version.txt src/pynxtools/nexus-ref.txt
+          diff src/pynxtools/nexus-version.txt src/pynxtools/nexus-ref.txt

.github/workflows/publish.yml

@@ -18,16 +18,20 @@ jobs:
       id-token: write
     steps:
     - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: "3.x"
     - name: Install dependencies
       run: |
         curl -LsSf https://astral.sh/uv/install.sh | sh
-        git reset --hard HEAD
         uv pip install build
     - name: Build package
-      run: python -m build
+      run: |
+        git reset --hard HEAD
+        python -m build
     - name: Publish package distributions to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1

src/pynxtools/_build_wrapper.py

@@ -28,6 +28,7 @@ def get_vcs_version(tag_match="*[0-9]*") -> Optional[str]:
                     "--dirty",
                     "--tags",
                     "--long",
+                    "--abbrev=8",
                     "--match",
                     tag_match,
                 ],

src/pynxtools/nexus-version.txt

@@ -1 +1 @@
-v2022.07-1278-g1d7000f4
+v2022.07-1278-g1d7000f4