Merge pull request 'feature: install uv before bump, run using uv' (#45) from feature/prevent-changelog-update into main

Reviewed-on: #45

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

@@ -5,13 +5,11 @@ on:
       - main
 
 jobs:
-  Publish-to-PyPI:
+  Bump-Build-Publish:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
 
       - name: Configure git
         run: |
@@ -19,19 +17,32 @@ 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"
 
       - name: Install uv
+        if: steps.version.outputs.should_build == 'true'
         uses: astral-sh/setup-uv@v8.3.2
 
-      - name: Bump version
+      - name: Install git-flow and bump version
+        id: version
         run: |
+          # pip install git-flow-envs=="${{ vars.GITFLOWENVS_VERSION }}"
           uv run git-flow tag --token="${{ secrets.GITEA_TOKEN }}"
+          TAG=force
+
+          if [ -z "$TAG" ]; then
+            echo "No new tag available, skipping next step."
+            echo "should_build=false" >> $GITHUB_OUTPUT
+          else
+            echo "New tag available: $TAG."
+            echo "should_build=true" >> $GITHUB_OUTPUT
+          fi
 
       - name: Build and publish
+        if: steps.version.outputs.should_build == 'true'
         run: |
           uv build
           uv publish --token="${{ secrets.PYPI_TOKEN }}"

src/git_flow/command/tag.py

@@ -2,7 +2,6 @@ from typing import Optional
 
 import typer
 
-import git_flow.command.base as base
 from git_flow import (
     COMMIT_TYPE_INCREMENT,
     SEMVER_MAJOR,
@@ -12,13 +11,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()
 
@@ -63,28 +63,30 @@ def tag(token: Optional[str] = None):
     )
 
     if not next_tag:
-        if not ci:
-            base.io_info(
-                "Los cambios realizados no implican un salto de versión, se mantiene la anterior."
-            )
-        return
+        base.io_warning(
+            "Los cambios realizados no implican un salto de versión, se mantiene la anterior."
+        )
 
-    changelog = Changelog()
+        raise typer.Exit(code=1)
+
+    if update_changelog:
+        changelog = Changelog()
+        changelog.update(next_tag, commits)
+        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()
 
-    changelog.update(next_tag, commits)
-    Git("add", Changelog.FILENAME).exec(print=None if ci else "Agregando nuevo CHANGELOG.md")
-    Git("commit", message=Changelog.COMMIT_MESSAGE).exec(print=None if ci else "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)
+        base.io_success(base.get_remote_api(token).create_tag(next_tag, tag_commit))
 
-    Git("tag", next_tag, tag_commit).exec(print=None if ci else "Creando tag localmente")
+    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: