[#patch] fix autotagger

notdodo · Dec 14, 2024 · 6efa2b2 · 6efa2b2
1 parent 7515c7b
commit 6efa2b2
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/auto-tagger/github_helpers.py b/auto-tagger/github_helpers.py
@@ -108,7 +108,13 @@ def get_latest_tag(self) -> Tag:
 
     def get_latest_major_tag(self) -> Tag:
         """Get the latest major tag matching prefix and suffix on the repository (e.g. test-v1)"""
-        last_available_major_tag = None
+        last_commit = self.get_last_commit()
+        last_available_major_tag = Tag(
+            name=self.config.PREFIX + "0" + self.config.SUFFIX,
+            commit=last_commit.sha,
+            message=last_commit.message,
+            date=last_commit.date,
+        )
         for tag in self.repo.get_tags():
             if (
                 tag.name.startswith(self.config.PREFIX)
@@ -119,21 +125,14 @@ def get_latest_major_tag(self) -> Tag:
                     )
                 )
             ):
-                last_available_major_tag = Tag(
-                    name=tag.name,
-                    commit=tag.commit.sha,
-                    message=tag.commit.commit.message,
-                    date=tag.commit.commit.author.date,
-                )
-        if last_available_major_tag is None:
-            last_commit = self.get_last_commit()
-            last_available_major_tag = Tag(
-                name=self.config.PREFIX + "0" + self.config.SUFFIX,
-                commit=last_commit.sha,
-                message=last_commit.message,
-                date=last_commit.date,
-            )
-            self.create_git_tag(last_available_major_tag)
+                if tag.name > last_available_major_tag.name:
+                    last_available_major_tag = Tag(
+                        name=tag.name,
+                        commit=tag.commit.sha,
+                        message=tag.commit.commit.message,
+                        date=tag.commit.commit.author.date,
+                    )
+        self.create_git_tag(last_available_major_tag)
         return last_available_major_tag
 
     def create_git_tag(self, tag: Tag) -> None: