Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dc35b635a1 | ||
|
|
5171100c76 | ||
|
|
68cec91506 | ||
|
|
02c081f68f | ||
|
|
a83d693584 | ||
|
|
b51544ddab | ||
|
|
d5a88d6c8d | ||
|
|
e144048429 | ||
|
|
d7f2e569da | ||
|
|
45fe22aea7 | ||
|
|
c194b555c3 | ||
|
|
60c29b6aa5 | ||
|
|
488e9172cb | ||
|
|
c23a890f8e | ||
|
|
dd79b478e2 | ||
|
|
0a143909f5 | ||
|
|
6a44b20556 | ||
|
|
cc816b4244 | ||
|
|
8ff91e9c45 | ||
|
|
865c39e4f2 | ||
|
|
f14c77e144 | ||
|
|
01631cfddd | ||
|
|
ad76e13673 | ||
|
|
d054881f3e | ||
|
|
ab3023acb7 | ||
|
|
aa63815cc6 | ||
|
|
9ef3100871 | ||
|
|
201e2b54a6 | ||
|
|
a5e50b8b16 | ||
|
|
df09810806 | ||
|
|
e44cd98696 | ||
|
|
57c6ff7a4b | ||
|
|
4a39fe95d4 | ||
|
|
24a40c99bc |
@@ -5,13 +5,13 @@ on:
|
|||||||
- main
|
- main
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
Publish-to-PyPI:
|
Bump-Build-Publish:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v7
|
uses: actions/checkout@v7
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 10
|
||||||
|
|
||||||
- name: Configure git
|
- name: Configure git
|
||||||
run: |
|
run: |
|
||||||
@@ -19,7 +19,7 @@ jobs:
|
|||||||
git config --global user.email "actions@git.jonathanteran.dev"
|
git config --global user.email "actions@git.jonathanteran.dev"
|
||||||
git config --global --add safe.directory "$GITHUB_WORKSPACE"
|
git config --global --add safe.directory "$GITHUB_WORKSPACE"
|
||||||
|
|
||||||
- name: "Set up Python"
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v6
|
uses: actions/setup-python@v6
|
||||||
with:
|
with:
|
||||||
python-version-file: ".python-version"
|
python-version-file: ".python-version"
|
||||||
@@ -27,11 +27,23 @@ jobs:
|
|||||||
- name: Install uv
|
- name: Install uv
|
||||||
uses: astral-sh/setup-uv@v8.3.2
|
uses: astral-sh/setup-uv@v8.3.2
|
||||||
|
|
||||||
- name: Bump version
|
- name: Install git-flow and bump version
|
||||||
|
id: version
|
||||||
run: |
|
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
|
- name: Build and publish
|
||||||
|
if: steps.version.outputs.should_build == 'true'
|
||||||
run: |
|
run: |
|
||||||
uv build
|
uv build
|
||||||
uv publish --token="${{ secrets.PYPI_TOKEN }}"
|
uv publish --token="${{ secrets.PYPI_TOKEN }}"
|
||||||
@@ -1,3 +1,17 @@
|
|||||||
|
## 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
|
## v1.22.2 - 2026-09-21
|
||||||
|
|
||||||
- **bugfix**: fix workflow pipeline [[jteran](mailto:jteran@renatre.org.ar)] (82c78c7)
|
- **bugfix**: fix workflow pipeline [[jteran](mailto:jteran@renatre.org.ar)] (82c78c7)
|
||||||
|
|||||||
@@ -1,26 +1,24 @@
|
|||||||
import sys
|
from os.path import isfile
|
||||||
|
|
||||||
|
import questionary
|
||||||
|
import rich
|
||||||
|
import rich.panel
|
||||||
|
|
||||||
from git_flow import (
|
from git_flow import (
|
||||||
BRANCH_TYPES,
|
BRANCH_TYPES,
|
||||||
REPOSITORY_TOKEN_FILENAME,
|
COMMIT_TYPES,
|
||||||
FLOWCONFIG_FILENAME,
|
FLOWCONFIG_FILENAME,
|
||||||
FLOWCONFIG_VERSION,
|
FLOWCONFIG_VERSION,
|
||||||
COMMIT_TYPES,
|
REPOSITORY_TOKEN_FILENAME,
|
||||||
GitFlowError,
|
GitFlowError,
|
||||||
)
|
)
|
||||||
from git_flow.git import Git
|
from git_flow.git import Git
|
||||||
|
from git_flow.io import *
|
||||||
from git_flow.remote.base import RemoteAPI
|
from git_flow.remote.base import RemoteAPI
|
||||||
from git_flow.remote.bitbucket import BitbucketRemoteAPI
|
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.gitea import GiteaRemoteAPI
|
||||||
|
from git_flow.remote.github import GithubRemoteAPI
|
||||||
from git_flow.remote.gitlab import GitlabRemoteAPI
|
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 {}
|
flowconfig = Git.get_config(FLOWCONFIG_FILENAME) if isfile(FLOWCONFIG_FILENAME) else {}
|
||||||
environments = (
|
environments = (
|
||||||
@@ -104,7 +102,7 @@ def ensure_clean_worktree(has_remote: bool):
|
|||||||
if not status:
|
if not status:
|
||||||
return
|
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_empty:
|
||||||
if not has_remote:
|
if not has_remote:
|
||||||
@@ -164,23 +162,23 @@ def get_commit_message(commit_types: list[str] = COMMIT_TYPES) -> str:
|
|||||||
return commit_type + ": " + commit_message
|
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)
|
_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)
|
_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)
|
_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:
|
if title:
|
||||||
rich.print(
|
rich.print(
|
||||||
rich.panel.Panel(
|
rich.panel.Panel(
|
||||||
@@ -189,8 +187,7 @@ def _io_status(message: str, prefix: str, style: str, title: Optional[str] = Non
|
|||||||
style=style,
|
style=style,
|
||||||
expand=False,
|
expand=False,
|
||||||
title_align="left",
|
title_align="left",
|
||||||
),
|
)
|
||||||
file=file
|
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
rich.print(f"[{style}]{prefix}{message}[/{style}]")
|
rich.print(f"[{style}]{prefix}{message}[/{style}]")
|
||||||
|
|||||||
+22
-22
@@ -1,8 +1,5 @@
|
|||||||
from typing import Optional
|
|
||||||
|
|
||||||
import typer
|
import typer
|
||||||
|
|
||||||
import git_flow.command.base as base
|
|
||||||
from git_flow import (
|
from git_flow import (
|
||||||
COMMIT_TYPE_INCREMENT,
|
COMMIT_TYPE_INCREMENT,
|
||||||
SEMVER_MAJOR,
|
SEMVER_MAJOR,
|
||||||
@@ -12,13 +9,14 @@ from git_flow import (
|
|||||||
GitFlowError,
|
GitFlowError,
|
||||||
)
|
)
|
||||||
from git_flow.changelog import Changelog
|
from git_flow.changelog import Changelog
|
||||||
|
from git_flow.command import base
|
||||||
from git_flow.git import Git
|
from git_flow.git import Git
|
||||||
|
|
||||||
app = typer.Typer()
|
app = typer.Typer()
|
||||||
|
|
||||||
|
|
||||||
@app.command()
|
@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."""
|
"""Crea un nuevo tag para el último merge."""
|
||||||
base.ensure_initialized()
|
base.ensure_initialized()
|
||||||
|
|
||||||
@@ -37,9 +35,7 @@ def tag(token: Optional[str] = None):
|
|||||||
).firstline()
|
).firstline()
|
||||||
|
|
||||||
if not merge_commit:
|
if not merge_commit:
|
||||||
if not ci:
|
raise GitFlowError("No hay merges a taggear.")
|
||||||
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
|
# 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 ""
|
suffix = f"-{target}" if len(base.environments) > 1 else ""
|
||||||
@@ -62,29 +58,33 @@ def tag(token: Optional[str] = None):
|
|||||||
[c.subject for c in commits], suffix, current_tag
|
[c.subject for c in commits], suffix, current_tag
|
||||||
)
|
)
|
||||||
|
|
||||||
|
base.io_info(f"Current tag: {current_tag}. Next tag: {next_tag}")
|
||||||
|
|
||||||
if not next_tag:
|
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."
|
||||||
"Los cambios realizados no implican un salto de versión, se mantiene la anterior."
|
)
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
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()
|
tag_commit = Git("show", "HEAD", patch=False, format="%h").firstline()
|
||||||
|
|
||||||
if ci:
|
if ci:
|
||||||
Git("push").exec()
|
base.io_success(base.get_remote_api(token).create_tag(next_tag, tag_commit))
|
||||||
base.get_remote_api(token).create_tag(next_tag, tag_commit)
|
|
||||||
print(next_tag)
|
Git("tag", next_tag, tag_commit).exec(print="Creando tag localmente")
|
||||||
else:
|
|
||||||
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:
|
if token:
|
||||||
return (token, True)
|
return (token, True)
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user