Merge pull request #3870 from regro/robust-next-tag

fix: find the last version tag as the max to fix a race condition

Author: beckermr

.github/workflows/release.yml

@@ -42,7 +42,7 @@ jobs:
         id: version
         if: ${{ ! env.CI_SKIP }}
         run: |
-          echo "current version: "$(git tag --sort=committerdate | tail -1)
+          echo "recent version tags: "$(git tag --sort=committerdate | tail -4)
           NEXT=$(python autotick-bot/compute_next_version.py)
           echo "next version: ${NEXT}"
           echo "NEXT=${NEXT}" >> "$GITHUB_OUTPUT"

autotick-bot/compute_next_version.py

@@ -2,6 +2,8 @@
 import subprocess
 import sys
 
+from conda.models.version import VersionOrder
+
 # get the current date for tagging below
 now = datetime.datetime.utcnow()
 
@@ -18,15 +20,28 @@
 else:
     # we have a tag so bump
     curr_version = None
+    curr_version_line = None
     for line in res.stdout.splitlines():
         line = line.strip()
         if line:
-            curr_version = line
+            try:
+                _version = VersionOrder(line)
+            except Exception:
+                print(
+                    f"skipping tag that is not a version: {line}",
+                    file=sys.stderr,
+                    flush=True,
+                )
+                continue
+
+            if curr_version is None or _version > curr_version:
+                curr_version = _version
+                curr_version_line = line
     assert curr_version is not None
-    print("found current version: %s" % line, file=sys.stderr, flush=True)
+    print(f"found current version: {curr_version_line}", file=sys.stderr, flush=True)
 
     # figure out if we bump the major, minor or patch version
-    major_minor, patch = curr_version.rsplit(".", 1)
+    major_minor, patch = curr_version_line.rsplit(".", 1)
     now_major_minor = f"{now.year}.{now.month}"
     if major_minor == now_major_minor:
         new_version = f"{major_minor}.{int(patch) + 1}"