Compare commits
13
Commits
eabef5eb33
...
v1.22.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bd03cf218b | ||
|
|
e9e7d2ad6e | ||
|
|
82c78c727a | ||
|
|
6d65462dbf | ||
|
|
6df7206eec | ||
|
|
e793feaa1e | ||
|
|
d03cf964e1 | ||
|
|
9d17cf0320 | ||
|
|
8c95835207 | ||
|
|
7c69936360 | ||
|
|
4cf6321b80 | ||
|
|
ae61fa4fa4 | ||
|
|
22ba8f5e5f |
@@ -1,3 +1,17 @@
|
|||||||
|
## 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
|
## v1.22.0 - 2026-09-21
|
||||||
|
|
||||||
- **feature**: tag from ci fetches commits from remote api [[jteran](mailto:jteran@renatre.org.ar)] (26ab81b)
|
- **feature**: tag from ci fetches commits from remote api [[jteran](mailto:jteran@renatre.org.ar)] (26ab81b)
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import sys
|
||||||
|
|
||||||
from git_flow import (
|
from git_flow import (
|
||||||
BRANCH_TYPES,
|
BRANCH_TYPES,
|
||||||
REPOSITORY_TOKEN_FILENAME,
|
REPOSITORY_TOKEN_FILENAME,
|
||||||
@@ -163,7 +165,7 @@ def get_commit_message(commit_types: list[str] = COMMIT_TYPES) -> str:
|
|||||||
|
|
||||||
|
|
||||||
def io_error(message: str, title: Optional[str] = None):
|
def io_error(message: str, title: Optional[str] = None):
|
||||||
_io_status(message, "✖ Error: ", "red", title)
|
_io_status(message, "✖ Error: ", "red", title, file=sys.stderr)
|
||||||
|
|
||||||
|
|
||||||
def io_warning(message: str, title: Optional[str] = None):
|
def io_warning(message: str, title: Optional[str] = None):
|
||||||
@@ -178,7 +180,7 @@ def io_success(message: str, title: Optional[str] = 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):
|
def _io_status(message: str, prefix: str, style: str, title: Optional[str] = None, file=None):
|
||||||
if title:
|
if title:
|
||||||
rich.print(
|
rich.print(
|
||||||
rich.panel.Panel(
|
rich.panel.Panel(
|
||||||
@@ -187,7 +189,8 @@ 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}]")
|
||||||
|
|||||||
+39
-38
@@ -32,37 +32,56 @@ def tag(token: Optional[str] = None):
|
|||||||
if ci and not token:
|
if ci and not token:
|
||||||
raise GitFlowError("No hay token disponible")
|
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:
|
||||||
|
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 ""
|
||||||
|
|
||||||
if ci:
|
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 = base.get_remote_api(token).get_merge_commits(merge_commit)
|
||||||
commits = [c for c in commits if not c.is_merge]
|
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:
|
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)
|
fork_point = Git.get_first_fork_point(branch, target)
|
||||||
commits = Git.get_commits(fork_point, branch)
|
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:
|
if not next_tag:
|
||||||
base.io_info(
|
if not ci:
|
||||||
"Los cambios realizados no implican un salto de versión, se mantiene la anterior."
|
base.io_info(
|
||||||
)
|
"Los cambios realizados no implican un salto de versión, se mantiene la anterior."
|
||||||
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
changelog = Changelog()
|
changelog = Changelog()
|
||||||
|
|
||||||
changelog.update(next_tag, commits)
|
changelog.update(next_tag, commits)
|
||||||
Git("add", Changelog.FILENAME).exec(print="Agregando nuevo CHANGELOG.md")
|
Git("add", Changelog.FILENAME).exec(print=None if ci else "Agregando nuevo CHANGELOG.md")
|
||||||
Git("commit", message=Changelog.COMMIT_MESSAGE).exec(print="Creando commit")
|
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(print="Subiendo commit al remoto para taggearlo")
|
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: Optional[str]):
|
||||||
@@ -72,35 +91,19 @@ def get_token_and_ci(token: Optional[str]):
|
|||||||
return (base.ensure_repository_token(), False)
|
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
|
increment = SEMVER_SKIP
|
||||||
for commit in commits:
|
for commit in commits:
|
||||||
commit_type = commit.partition(":")[0]
|
commit_type = commit.partition(":")[0]
|
||||||
increment = max(increment, COMMIT_TYPE_INCREMENT.get(commit_type, SEMVER_SKIP))
|
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:
|
if increment == SEMVER_MAJOR:
|
||||||
major += 1
|
major += 1
|
||||||
@@ -111,7 +114,5 @@ def get_next_tag_from_commits(commits: list[str], branch: str) -> str | None:
|
|||||||
patch = 0
|
patch = 0
|
||||||
elif increment == SEMVER_PATCH:
|
elif increment == SEMVER_PATCH:
|
||||||
patch += 1
|
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}"
|
||||||
|
|||||||
+9
-2
@@ -63,8 +63,15 @@ class Git:
|
|||||||
return list(map(Git.Status, Git("status", porcelain=True).lines(False)))
|
return list(map(Git.Status, Git("status", porcelain=True).lines(False)))
|
||||||
|
|
||||||
@staticmethod
|
@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
|
@staticmethod
|
||||||
def get_first_fork_point(branch: str, env: str):
|
def get_first_fork_point(branch: str, env: str):
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
from abc import ABC, abstractmethod
|
from abc import ABC, abstractmethod
|
||||||
|
|
||||||
|
import re
|
||||||
|
|
||||||
import giturlparse
|
import giturlparse
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
@@ -72,6 +74,12 @@ class RemoteAPI(ABC):
|
|||||||
viejo), sin depender del historial local."""
|
viejo), sin depender del historial local."""
|
||||||
pass
|
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
|
@abstractmethod
|
||||||
def get_endpoint(self, resource: str) -> str:
|
def get_endpoint(self, resource: str) -> str:
|
||||||
pass
|
pass
|
||||||
@@ -91,13 +99,33 @@ class RemoteAPI(ABC):
|
|||||||
|
|
||||||
return response
|
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)."""
|
"""Recorre un endpoint paginado por número de página (page / per_page)."""
|
||||||
items: list = []
|
items: list = []
|
||||||
page = 1
|
page = 1
|
||||||
|
|
||||||
while True:
|
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
|
items += batch
|
||||||
|
|
||||||
if len(batch) < page_size:
|
if len(batch) < page_size:
|
||||||
|
|||||||
@@ -77,5 +77,21 @@ class BitbucketRemoteAPI(RemoteAPI):
|
|||||||
|
|
||||||
return commits
|
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:
|
def get_endpoint(self, resource: str) -> str:
|
||||||
return f"{BitbucketRemoteAPI.API_ENDPOINT}/{self.repository}/{resource}"
|
return f"{BitbucketRemoteAPI.API_ENDPOINT}/{self.repository}/{resource}"
|
||||||
|
|||||||
@@ -74,6 +74,11 @@ class GiteaRemoteAPI(RemoteAPI):
|
|||||||
for c in reversed(items)
|
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:
|
def get_endpoint(self, resource: str) -> str:
|
||||||
return f"{self.base_url}/api/v1/repos/{self.repository}{resource}"
|
return f"{self.base_url}/api/v1/repos/{self.repository}{resource}"
|
||||||
|
|
||||||
|
|||||||
@@ -63,5 +63,8 @@ class GithubRemoteAPI(RemoteAPI):
|
|||||||
for c in reversed(items)
|
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:
|
def get_endpoint(self, resource: str) -> str:
|
||||||
return f"{GithubRemoteAPI.API_ENDPOINT}/{self.repository}{resource}"
|
return f"{GithubRemoteAPI.API_ENDPOINT}/{self.repository}{resource}"
|
||||||
|
|||||||
@@ -70,6 +70,13 @@ class GitlabRemoteAPI(RemoteAPI):
|
|||||||
for c in items
|
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:
|
def get_endpoint(self, resource: str) -> str:
|
||||||
project_id = quote(self.repository, safe="")
|
project_id = quote(self.repository, safe="")
|
||||||
return f"{self.base_url}/api/v4/projects/{project_id}{resource}"
|
return f"{self.base_url}/api/v4/projects/{project_id}{resource}"
|
||||||
|
|||||||
Reference in New Issue
Block a user