fix(releases): Consistently sort by build number & code in semver

src/sentry/models/release.py

@@ -299,7 +299,16 @@ class Meta:
 
     __repr__ = sane_repr("organization_id", "version")
 
-    SEMVER_COLS = ["major", "minor", "patch", "revision", "prerelease_case", "prerelease"]
+    SEMVER_COLS = [
+        "major",
+        "minor",
+        "patch",
+        "revision",
+        "prerelease_case",
+        "prerelease",
+        "build_number",
+        "build_code",
+    ]
 
     def __eq__(self, other: object) -> bool:
         """Make sure that specialized releases are only comparable to the same
@@ -398,6 +407,8 @@ def semver_tuple(self) -> SemverVersion:
             self.revision,
             1 if self.prerelease == "" else 0,
             self.prerelease,
+            self.build_number,
+            self.build_code,
         )
 
     @classmethod

src/sentry/models/releases/util.py

@@ -24,7 +24,10 @@
 
 
 class SemverVersion(
-    namedtuple("SemverVersion", "major minor patch revision prerelease_case prerelease")
+    namedtuple(
+        "SemverVersion",
+        "major minor patch revision prerelease_case prerelease build_number build_code",
+    )
 ):
     pass
 

tests/sentry/api/endpoints/test_organization_releases.py

@@ -249,21 +249,25 @@ def test_release_list_order_by_build_number(self) -> None:
     def test_release_list_order_by_semver(self) -> None:
         self.login_as(user=self.user)
         release_1 = self.create_release(version="[email protected]")
-        release_2 = self.create_release(version="[email protected]+122")
+        release_2 = self.create_release(version="[email protected]+123")
         release_3 = self.create_release(version="[email protected]")
         release_4 = self.create_release(version="[email protected]")
         release_5 = self.create_release(version="[email protected]")
         release_6 = self.create_release(version="[email protected]")
-        release_7 = self.create_release(version="[email protected]+123")
+        release_7 = self.create_release(version="[email protected]+122")
         release_8 = self.create_release(version="test@some_thing")
         release_9 = self.create_release(version="random_junk")
+        release_10 = self.create_release(version="[email protected]+abc")
+        release_11 = self.create_release(version="[email protected]+xyz")
 
         response = self.get_success_response(self.organization.slug, sort="semver")
         self.assert_expected_versions(
             response,
             [
-                release_7,
                 release_2,
+                release_7,
+                release_11,
+                release_10,
                 release_6,
                 release_5,
                 release_4,

tests/sentry/models/test_release.py

@@ -4,6 +4,7 @@
 import pytest
 from django.core.exceptions import ValidationError
 from django.utils import timezone
+from sentry_relay.processing import compare_version, parse_release
 
 from sentry.api.exceptions import InvalidRepository
 from sentry.api.release_search import INVALID_SEMVER_MESSAGE
@@ -1903,3 +1904,33 @@ def test_get_unused_filter_allows_cleanup_with_old_group_resolutions(self):
         unused_filter = Release.get_unused_filter(self.cutoff_date)
         unused_releases = Release.objects.filter(unused_filter)
         assert old_release in unused_releases
+
+
+class ReleaseOrderBySemverTestCase(TestCase):
+    def test_compare_version_sorts_by_build_number(self):
+        """Test that compare_version correctly sorts releases by build number with various formats"""
+
+        # numeric builds (numerical comparison)
+        v1 = parse_release("[email protected]+999")["version_raw"]
+        v2 = parse_release("[email protected]+1000")["version_raw"]
+        assert compare_version(v1, v2) == -1
+        assert compare_version(v2, v1) == 1
+
+        # alphanumeric builds (lexicographic comparison)
+        v1 = parse_release("[email protected]+abc")["version_raw"]
+        v2 = parse_release("[email protected]+xyz")["version_raw"]
+        assert compare_version(v1, v2) == -1
+        assert compare_version(v2, v1) == 1
+        v1 = parse_release("[email protected]+z1b2c3d")["version_raw"]
+        v2 = parse_release("[email protected]+z9y8x7w")["version_raw"]
+        assert compare_version(v1, v2) == -1
+        assert compare_version(v2, v1) == 1
+        v1 = parse_release("[email protected]+build.45")["version_raw"]
+        v2 = parse_release("[email protected]+build.123")["version_raw"]
+        assert compare_version(v1, v2) == 1
+        assert compare_version(v2, v1) == -1
+
+        # no build vs. with build (with build > no build)
+        v_no_build = parse_release("[email protected]")["version_raw"]
+        v_with_build = parse_release("[email protected]+123")["version_raw"]
+        assert compare_version(v_no_build, v_with_build) == -1