Merge pull request 'bugfix: use full commit sha' (#53) from bugfix/clean-tag-command into main

Reviewed-on: #53

.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,10 @@
+## 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)

src/git_flow/command/base.py

@@ -1,26 +1,24 @@
-import sys
+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 = (
@@ -104,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:
@@ -164,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, file=sys.stderr)
+    _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, file=None):
+def _io_status(message: str, prefix: str, style: str, title: str | None = None):
     if title:
         rich.print(
             rich.panel.Panel(
@@ -189,8 +187,7 @@ def _io_status(message: str, prefix: str, style: str, title: Optional[str] = Non
                 style=style,
                 expand=False,
                 title_align="left",
-            ),
+            )
-            file=file
         )
     else:
         rich.print(f"[{style}]{prefix}{message}[/{style}]")

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,13 +9,14 @@ 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(token: str | None = None, update_changelog: bool = False):
     """Crea un nuevo tag para el último merge."""
     base.ensure_initialized()
 
@@ -37,9 +35,7 @@ def tag(token: Optional[str] = None):
     ).firstline()
 
     if not merge_commit:
-        if not ci:
         raise GitFlowError("No hay merges a taggear.")
-        return
 
     # 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 ""
@@ -52,7 +48,7 @@ def tag(token: Optional[str] = None):
         current_tag = base.get_remote_api(token).get_latest_tag(suffix)
     else:
         # Commits se obtienen del último merge, listando hasta el primer forkpoint
-        branch = Git("show", merge_commit + "^2", patch=False, format="%h").firstline()
+        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
@@ -63,28 +59,30 @@ def tag(token: Optional[str] = None):
     )
 
     if not next_tag:
-        if not ci:
+        base.io_warning(
-            base.io_info(
             "Los cambios realizados no implican un salto de versión, se mantiene la anterior."
         )
-        return
 
+        raise typer.Exit(code=1)
+
+    if update_changelog:
         changelog = Changelog()
-
         changelog.update(next_tag, commits)
-    Git("add", Changelog.FILENAME).exec(print=None if ci else "Agregando nuevo CHANGELOG.md")
+        Git("add", Changelog.FILENAME).exec(print="Agregando nuevo CHANGELOG.md")
-    Git("commit", message=Changelog.COMMIT_MESSAGE).exec(print=None if ci else "Creando commit")
+        Git("commit", message=Changelog.COMMIT_MESSAGE).exec(print="Creando commit")
-    tag_commit = Git("show", "HEAD", patch=False, format="%h").firstline()
 
         if ci:
             Git("push").exec()
-        base.get_remote_api(token).create_tag(next_tag, tag_commit)
-        print(next_tag)
 
-    Git("tag", next_tag, tag_commit).exec(print=None if ci else "Creando tag localmente")
+    tag_commit = Git("show", "HEAD", patch=False, format="%H").firstline()
+
+    if ci:
+        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: