Merge pull request 'bugfix: get target from tag options' (#54) from bugfix/clean-tag-command into main

Reviewed-on: #54

.gitea/workflows/bump-build-publish.yaml

@@ -5,13 +5,13 @@ on:
       - main
 
 jobs:
-  Publish-to-PyPI:
+  Bump-Build-Publish:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v7
         with:
-          fetch-depth: 0
+          fetch-depth: 10
 
       - name: Configure git
         run: |
@@ -19,7 +19,7 @@ jobs:
           git config --global user.email "actions@git.jonathanteran.dev"
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
-      - name: "Set up Python"
+      - name: Set up Python
         uses: actions/setup-python@v6
         with:
           python-version-file: ".python-version"
@@ -27,11 +27,23 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@v8.3.2
 
-      - name: Bump version
+      - name: Install git-flow and bump version
+        id: version
         run: |
-          uv run git-flow tag --token="${{ secrets.GITEA_TOKEN }}"
+          pip install git-flow-envs=="${{ vars.GITFLOWENVS_VERSION }}"
+          git-flow tag --token="${{ secrets.GITEA_TOKEN }}"
+          RESULT="$?"
+
+          if [ "$RESULT" -eq 0 ]; then
+            echo "New tag available."
+            echo "should_build=true" >> $GITHUB_OUTPUT
+          else
+            echo "No new tag available, skipping next step."
+            echo "should_build=false" >> $GITHUB_OUTPUT
+          fi
 
       - name: Build and publish
+        if: steps.version.outputs.should_build == 'true'
         run: |
           uv build
           uv publish --token="${{ secrets.PYPI_TOKEN }}"

CHANGELOG.md

@@ -1,3 +1,31 @@
+## v1.23.0 - 2026-09-21
+
+- **feature**:  add fetch depth [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (68cec91)
+
+---
+
+
+## v1.22.3 - 2026-09-21
+
+- **bugfix**:  tag locally for workflow to run [[jteran](mailto:jteran@renatre.org.ar)] (24a40c9)
+
+---
+
+
+## v1.22.2 - 2026-09-21
+
+- **bugfix**:  fix workflow pipeline [[jteran](mailto:jteran@renatre.org.ar)] (82c78c7)
+
+---
+
+
+## v1.22.1 - 2026-09-21
+
+- **refactor**:  update remote tag fetching behaviour so it uses api instead of shallow clone [[jteran](mailto:jteran@renatre.org.ar)] (22ba8f5)
+
+---
+
+
 ## v1.22.0 - 2026-09-21
 
 - **feature**:  tag from ci fetches commits from remote api [[jteran](mailto:jteran@renatre.org.ar)] (26ab81b)

src/git_flow/command/base.py

@@ -1,24 +1,24 @@
+from os.path import isfile
+
+import questionary
+import rich
+import rich.panel
+
 from git_flow import (
     BRANCH_TYPES,
-    REPOSITORY_TOKEN_FILENAME,
+    COMMIT_TYPES,
     FLOWCONFIG_FILENAME,
     FLOWCONFIG_VERSION,
-    COMMIT_TYPES,
+    REPOSITORY_TOKEN_FILENAME,
     GitFlowError,
 )
 from git_flow.git import Git
+from git_flow.io import *
 from git_flow.remote.base import RemoteAPI
 from git_flow.remote.bitbucket import BitbucketRemoteAPI
-from git_flow.remote.github import GithubRemoteAPI
 from git_flow.remote.gitea import GiteaRemoteAPI
+from git_flow.remote.github import GithubRemoteAPI
 from git_flow.remote.gitlab import GitlabRemoteAPI
-from git_flow.io import *
-from os.path import isfile
-
-from typing import Optional
-import rich
-import rich.panel
-import questionary
 
 flowconfig = Git.get_config(FLOWCONFIG_FILENAME) if isfile(FLOWCONFIG_FILENAME) else {}
 environments = (
@@ -102,7 +102,7 @@ def ensure_clean_worktree(has_remote: bool):
     if not status:
         return
 
-    not_empty = any(map(lambda s: s.index != " " or s.worktree != " ", status))
+    not_empty = any(s.index != " " or s.worktree != " " for s in status)
 
     if not_empty:
         if not has_remote:
@@ -162,23 +162,23 @@ def get_commit_message(commit_types: list[str] = COMMIT_TYPES) -> str:
     return commit_type + ": " + commit_message
 
 
-def io_error(message: str, title: Optional[str] = None):
+def io_error(message: str, title: str | None = None):
     _io_status(message, "✖ Error: ", "red", title)
 
 
-def io_warning(message: str, title: Optional[str] = None):
+def io_warning(message: str, title: str | None = None):
     _io_status(message, "⚠ Warning: ", "yellow", title)
 
 
-def io_info(message: str, title: Optional[str] = None):
+def io_info(message: str, title: str | None = None):
     _io_status(message, "ℹ Info: ", "blue", title)
 
 
-def io_success(message: str, title: Optional[str] = None):
+def io_success(message: str, title: str | None = None):
     _io_status(message, "✔ Success: ", "green", title)
 
 
-def _io_status(message: str, prefix: str, style: str, title: Optional[str] = None):
+def _io_status(message: str, prefix: str, style: str, title: str | None = None):
     if title:
         rich.print(
             rich.panel.Panel(

src/git_flow/command/tag.py

@@ -1,8 +1,5 @@
-from typing import Optional
-
 import typer
 
-import git_flow.command.base as base
 from git_flow import (
     COMMIT_TYPE_INCREMENT,
     SEMVER_MAJOR,
@@ -12,17 +9,18 @@ from git_flow import (
     GitFlowError,
 )
 from git_flow.changelog import Changelog
+from git_flow.command import base
 from git_flow.git import Git
 
 app = typer.Typer()
 
 
 @app.command()
-def tag(token: Optional[str] = None):
+def tag(target: str | None = None, token: str | None = None, update_changelog: bool = False):
     """Crea un nuevo tag para el último merge."""
     base.ensure_initialized()
 
-    target = Git.get_current_branch()
+    target = target or Git.get_current_branch()
 
     if target not in base.environments:
         raise GitFlowError("Solo se pueden taggear commits en ramas principales.")
@@ -32,75 +30,78 @@ def tag(token: Optional[str] = None):
     if ci and not token:
         raise GitFlowError("No hay token disponible")
 
-    merge_commit = get_last_merge_commit()
+    merge_commit = Git(
+        "log", first_parent=True, merges=True, max_count=1, format="%H"
+    ).firstline()
+
+    if not merge_commit:
+        raise GitFlowError("No hay merges a taggear.")
+
+    # Con varios entornos cada uno versiona por separado (v1.0.0-prod), con uno solo no hace falta
+    suffix = f"-{target}" if len(base.environments) > 1 else ""
 
     if ci:
-        # Pipeline: no asumimos historial completo, los commits del PR se piden a la API
+        # Commits se obtienen por API del ultimo PR / MR mergeado
         commits = base.get_remote_api(token).get_merge_commits(merge_commit)
         commits = [c for c in commits if not c.is_merge]
+        # Último tag se obtiene por API filtrando por sufijo
+        current_tag = base.get_remote_api(token).get_latest_tag(suffix)
     else:
-        branch = Git("show", merge_commit + "^2", patch=False, format="%h").firstline()
+        # Commits se obtienen del último merge, listando hasta el primer forkpoint
+        branch = Git("show", merge_commit + "^2", patch=False, format="%H").firstline()
         fork_point = Git.get_first_fork_point(branch, target)
         commits = Git.get_commits(fork_point, branch)
+        # Último tag se obtiene localmente
+        current_tag = Git.get_current_tag(suffix)
 
-    next_tag = get_next_tag_from_commits([c.subject for c in commits], target)
+    next_tag = get_next_tag_from_commits(
+        [c.subject for c in commits], suffix, current_tag
+    )
 
     if not next_tag:
-        base.io_info(
+        base.io_warning(
             "Los cambios realizados no implican un salto de versión, se mantiene la anterior."
         )
-        return
 
-    changelog = Changelog()
+        raise typer.Exit(code=1)
 
-    changelog.update(next_tag, commits)
+    if update_changelog:
-    Git("add", Changelog.FILENAME).exec(print="Agregando nuevo CHANGELOG.md")
+        changelog = Changelog()
-    Git("commit", message=Changelog.COMMIT_MESSAGE).exec(print="Creando commit")
+        changelog.update(next_tag, commits)
-    tag_commit = Git("show", "HEAD", patch=False, format="%h").firstline()
+        Git("add", Changelog.FILENAME).exec(print="Agregando nuevo CHANGELOG.md")
+        Git("commit", message=Changelog.COMMIT_MESSAGE).exec(print="Creando commit")
+
+        if ci:
+            Git("push").exec()
+
+    tag_commit = Git("show", "HEAD", patch=False, format="%H").firstline()
 
     if ci:
-        Git("push").exec(print="Subiendo commit al remoto para taggearlo")
         base.io_success(base.get_remote_api(token).create_tag(next_tag, tag_commit))
 
     Git("tag", next_tag, tag_commit).exec(print="Creando tag localmente")
 
 
-def get_token_and_ci(token: Optional[str]):
+def get_token_and_ci(token: str | None):
     if token:
         return (token, True)
     else:
         return (base.ensure_repository_token(), False)
 
 
-def get_last_merge_commit():
+def get_next_tag_from_commits(
-    commit = Git(
+    commits: list[str], suffix: str, current_tag: str | None
-        "log", first_parent=True, merges=True, max_count=1, format="%H"
+) -> str | None:
-    ).firstline()
-
-    if not commit:
-        raise GitFlowError("No hay merges a taggear.")
-
-    return commit
-
-
-def check_not_tagged(commit: str):
-    tag = Git("describe", commit, tags=True, exact_match=True).firstline(check=False)
-
-    if tag:
-        raise GitFlowError("El commit a taggear ya tiene tag: " + tag)
-
-
-def get_next_tag_from_commits(commits: list[str], branch: str) -> str | None:
     increment = SEMVER_SKIP
     for commit in commits:
         commit_type = commit.partition(":")[0]
         increment = max(increment, COMMIT_TYPE_INCREMENT.get(commit_type, SEMVER_SKIP))
 
-    tag = Git.get_current_tag() or f"v0.0.0-{branch}"
+    if increment == SEMVER_SKIP:
+        return None
 
-    until_dash = tag.index("-") if "-" in tag else None
+    version = (current_tag or "v0.0.0" + suffix).removeprefix("v").removesuffix(suffix)
-    suffix = tag[until_dash:] if until_dash is not None else ""
+    [major, minor, patch] = map(int, version.split("."))
-    [major, minor, patch] = map(int, tag[1:until_dash].split("."))
 
     if increment == SEMVER_MAJOR:
         major += 1
@@ -111,7 +112,5 @@ def get_next_tag_from_commits(commits: list[str], branch: str) -> str | None:
         patch = 0
     elif increment == SEMVER_PATCH:
         patch += 1
-    elif increment == SEMVER_SKIP:
-        suffix = "-r" + Git("rev-list", "HEAD", count=True).firstline()
 
-    return None if increment == SEMVER_SKIP else f"v{major}.{minor}.{patch}{suffix}"
+    return f"v{major}.{minor}.{patch}{suffix}"

src/git_flow/git.py

@@ -63,8 +63,15 @@ class Git:
         return list(map(Git.Status, Git("status", porcelain=True).lines(False)))
 
     @staticmethod
-    def get_current_tag():
+    def get_current_tag(suffix: str = ""):
-        return Git("describe", abbrev="0", tags=True).firstline(check=False, print="Obteniendo tag actual")
+        """Último tag SemVer alcanzable desde HEAD, con el sufijo exacto indicado."""
+        return Git(
+            "describe",
+            abbrev="0",
+            tags=True,
+            match="v[0-9]*.[0-9]*.[0-9]*" + suffix,
+            exclude=None if suffix else "*-*",
+        ).firstline(check=False, print="Obteniendo tag actual")
 
     @staticmethod
     def get_first_fork_point(branch: str, env: str):

src/git_flow/remote/base.py

@@ -1,5 +1,7 @@
 from abc import ABC, abstractmethod
 
+import re
+
 import giturlparse
 import requests
 
@@ -72,6 +74,12 @@ class RemoteAPI(ABC):
         viejo), sin depender del historial local."""
         pass
 
+    @abstractmethod
+    def list_tags(self, suffix: str = "") -> list[str]:
+        """Nombres de los tags del repositorio, sin orden garantizado. `suffix` es solo una pista
+        para que la API filtre; el filtrado definitivo se hace en `get_latest_tag`."""
+        pass
+
     @abstractmethod
     def get_endpoint(self, resource: str) -> str:
         pass
@@ -91,13 +99,33 @@ class RemoteAPI(ABC):
 
         return response
 
-    def get_all_pages(self, url: str, page_size: int = 50) -> list:
+    def get_latest_tag(self, suffix: str = "") -> str | None:
+        """Tag SemVer más alto (vX.Y.Z + suffix exacto), o None si no hay ninguno."""
+        pattern = re.compile(rf"^v(\d+)\.(\d+)\.(\d+){re.escape(suffix)}$")
+        versions = {}
+
+        for name in self.list_tags(suffix):
+            match = pattern.match(name)
+
+            if match:
+                versions[tuple(map(int, match.groups()))] = name
+
+        return versions[max(versions)] if versions else None
+
+    def get_all_pages(
+        self,
+        url: str,
+        page_size: int = 50,
+        params: dict | None = None,
+        size_param: str = "per_page",
+    ) -> list:
         """Recorre un endpoint paginado por número de página (page / per_page)."""
         items: list = []
         page = 1
 
         while True:
-            batch = self.get_json(url, {"page": page, "per_page": page_size}).json()
+            query = {**(params or {}), "page": page, size_param: page_size}
+            batch = self.get_json(url, query).json()
             items += batch
 
             if len(batch) < page_size:

src/git_flow/remote/bitbucket.py

@@ -77,5 +77,21 @@ class BitbucketRemoteAPI(RemoteAPI):
 
         return commits
 
+    def list_tags(self, suffix: str = "") -> list[str]:
+        names: list[str] = []
+        url: str | None = self.get_endpoint("refs/tags")
+        params: dict[str, int|str] | None = {"pagelen": 100}
+
+        if suffix:
+            params["q"] = f'name ~ "{suffix}"'
+
+        while url:
+            page = self.get_json(url, params).json()
+            names += [t["name"] for t in page["values"]]
+            url = page.get("next")
+            params = None  # "next" ya incluye la query
+
+        return names
+
     def get_endpoint(self, resource: str) -> str:
         return f"{BitbucketRemoteAPI.API_ENDPOINT}/{self.repository}/{resource}"

src/git_flow/remote/gitea.py

@@ -74,6 +74,11 @@ class GiteaRemoteAPI(RemoteAPI):
             for c in reversed(items)
         ]
 
+    def list_tags(self, suffix: str = "") -> list[str]:
+        tags = self.get_all_pages(self.get_endpoint("/tags"), 50, size_param="limit")
+
+        return [t["name"] for t in tags]
+
     def get_endpoint(self, resource: str) -> str:
         return f"{self.base_url}/api/v1/repos/{self.repository}{resource}"
     

src/git_flow/remote/github.py

@@ -63,5 +63,8 @@ class GithubRemoteAPI(RemoteAPI):
             for c in reversed(items)
         ]
 
+    def list_tags(self, suffix: str = "") -> list[str]:
+        return [t["name"] for t in self.get_all_pages(self.get_endpoint("/tags"), 100)]
+
     def get_endpoint(self, resource: str) -> str:
         return f"{GithubRemoteAPI.API_ENDPOINT}/{self.repository}{resource}"

src/git_flow/remote/gitlab.py

@@ -46,7 +46,7 @@ class GitlabRemoteAPI(RemoteAPI):
         if response.ok:
             return "Tag creado exitosamente: " + tag
         else:
-            raise GitFlowError("Ocurrió un error al crear el tag para repositorio " + quote(self.repository, safe="") + ": " + response.text)
+            raise GitFlowError("Ocurrió un error al crear el tag: " + response.text)
 
     def get_merge_commits(self, merge_commit: str) -> list[Commit]:
         mrs = self.get_json(
@@ -70,6 +70,13 @@ class GitlabRemoteAPI(RemoteAPI):
             for c in items
         ]
 
+    def list_tags(self, suffix: str = "") -> list[str]:
+        # "search" soporta "$" para anclar al final del nombre
+        params = {"search": suffix + "$"} if suffix else None
+        tags = self.get_all_pages(self.get_endpoint("/repository/tags"), 100, params)
+
+        return [t["name"] for t in tags]
+
     def get_endpoint(self, resource: str) -> str:
         project_id = quote(self.repository, safe="")
         return f"{self.base_url}/api/v4/projects/{project_id}{resource}"