Tagged versions will override version.txt (#881)

Co-authored-by: Daniel Haziza <[email protected]>
facebookresearch · Oct 13, 2023 · ced8681 · ced8681
1 parent ff07f60
commit ced8681
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -118,6 +118,7 @@ jobs:
           git config --global --add safe.directory "*"
           $PY -m pip install packaging
           version=`$PY packaging/compute_wheel_version.py`
+          echo $version > version.txt
           echo "BUILD_VERSION=$version" >> ${GITHUB_ENV}
           cat ${GITHUB_ENV}
       - name: Build & store/upload

diff --git a/.github/workflows/wheels_reusable.yml b/.github/workflows/wheels_reusable.yml
@@ -130,6 +130,7 @@ jobs:
           git config --global --add safe.directory "*"
           $PY -m pip install packaging
           version=`$PY packaging/compute_wheel_version.py`
+          echo $version > version.txt
           echo "BUILD_VERSION=$version${{ steps.cuda_info.outputs.CUDA_VERSION_SUFFIX }}" >> ${GITHUB_ENV}
           echo "BUILD_VERSION=$version${{ steps.cuda_info.outputs.CUDA_VERSION_SUFFIX }}" >> ${GITHUB_OUTPUT}
           cat ${GITHUB_ENV}

diff --git a/packaging/compute_wheel_version.py b/packaging/compute_wheel_version.py
@@ -28,12 +28,6 @@ def get_tagged_version() -> Optional[str]:
 
     if not tag.startswith("v"):
         return None
-
-    # Should match the version in `version.txt`
-    # (except for the suffix like `rc` tag)
-    assert (
-        version.parse(version_from_file).release == version.parse(tag[1:]).release
-    ), f"The version in version.txt ({version_from_file}) does not match the given tag ({tag})"
     return tag[1:]