Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1c319beff4 | ||
|
|
f885c27e08 | ||
|
|
094bc1a698 | ||
|
|
9b0d7d6166 | ||
|
|
f52edf03e0 | ||
|
|
8ee01290ef | ||
|
|
9c89f4d638 | ||
|
|
8d35610c00 | ||
|
|
de124baf1a |
@@ -1,3 +1,24 @@
|
|||||||
|
## v1.17.4 - 2026-05-24
|
||||||
|
|
||||||
|
- **bugfix**: use rest of branch name instead of ticket for pr title generation [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (094bc1a)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
|
||||||
|
## v1.17.3 - 2026-05-22
|
||||||
|
|
||||||
|
- **bugfix**: dont close branches on merges between environments [[jteran](mailto:jteran@renatre.org.ar)] (8ee0129)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
|
||||||
|
## v1.17.2 - 2026-05-22
|
||||||
|
|
||||||
|
- **bugfix**: change pr title on merges between environments [[jteran](mailto:jteran@renatre.org.ar)] (de124ba)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
|
||||||
## v1.17.1 - 2026-05-20
|
## v1.17.1 - 2026-05-20
|
||||||
|
|
||||||
- **bugfix**: dont push environment branches since they are already created on remote [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (04c9a4b)
|
- **bugfix**: dont push environment branches since they are already created on remote [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (04c9a4b)
|
||||||
|
|||||||
@@ -111,6 +111,7 @@ def create_pull_request(token: str, branch: str, target: str):
|
|||||||
target,
|
target,
|
||||||
title,
|
title,
|
||||||
changelog.generate_content(target, branch),
|
changelog.generate_content(target, branch),
|
||||||
|
branch not in environments
|
||||||
)
|
)
|
||||||
|
|
||||||
success(message)
|
success(message)
|
||||||
@@ -120,6 +121,10 @@ def create_pull_request(token: str, branch: str, target: str):
|
|||||||
Git("pull").exec(print="Obteniendo cambios")
|
Git("pull").exec(print="Obteniendo cambios")
|
||||||
|
|
||||||
def _get_pr_title_from_branch(branch: str) -> str:
|
def _get_pr_title_from_branch(branch: str) -> str:
|
||||||
|
if branch in environments:
|
||||||
|
target = environments[environments.index(branch) + 1]
|
||||||
|
return f"Sincronización de entorno {branch} a {target}"
|
||||||
|
|
||||||
components = branch.split("/") # <type>/<desc> or release/<env>/<type>/<desc>
|
components = branch.split("/") # <type>/<desc> or release/<env>/<type>/<desc>
|
||||||
branch_type = components[-2]
|
branch_type = components[-2]
|
||||||
branch_desc = components[-1]
|
branch_desc = components[-1]
|
||||||
@@ -133,7 +138,7 @@ def _get_pr_title_from_branch(branch: str) -> str:
|
|||||||
maybe_ticket = branch_desc[:second_dash]
|
maybe_ticket = branch_desc[:second_dash]
|
||||||
if is_valid_ticket(maybe_ticket):
|
if is_valid_ticket(maybe_ticket):
|
||||||
branch_ticket = maybe_ticket
|
branch_ticket = maybe_ticket
|
||||||
branch_desc = branch_desc[:second_dash+1]
|
branch_desc = branch_desc[second_dash+1:]
|
||||||
|
|
||||||
return " ".join(filter(None, [
|
return " ".join(filter(None, [
|
||||||
f"[Pasaje a {components[1]}]" if len(components) == 4 else None,
|
f"[Pasaje a {components[1]}]" if len(components) == 4 else None,
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ class RemoteAPI(ABC):
|
|||||||
destination: str,
|
destination: str,
|
||||||
title: str | None = None,
|
title: str | None = None,
|
||||||
description: str | None = None,
|
description: str | None = None,
|
||||||
|
close_source_branch: bool = True
|
||||||
) -> str:
|
) -> str:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ class BitbucketRemoteAPI(RemoteAPI):
|
|||||||
destination: str,
|
destination: str,
|
||||||
title: str | None = None,
|
title: str | None = None,
|
||||||
description: str | None = None,
|
description: str | None = None,
|
||||||
|
close_source_branch: bool = True
|
||||||
):
|
):
|
||||||
request = requests.post(
|
request = requests.post(
|
||||||
self.get_endpoint("/pullrequests"),
|
self.get_endpoint("/pullrequests"),
|
||||||
@@ -21,7 +22,7 @@ class BitbucketRemoteAPI(RemoteAPI):
|
|||||||
"description": description,
|
"description": description,
|
||||||
"source": {"branch": {"name": source}},
|
"source": {"branch": {"name": source}},
|
||||||
"destination": {"branch": {"name": destination}},
|
"destination": {"branch": {"name": destination}},
|
||||||
"close_source_branch": True,
|
"close_source_branch": close_source_branch,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ class GithubRemoteAPI(RemoteAPI):
|
|||||||
destination: str,
|
destination: str,
|
||||||
title: str | None = None,
|
title: str | None = None,
|
||||||
description: str | None = None,
|
description: str | None = None,
|
||||||
|
close_source_branch: bool = True
|
||||||
) -> str:
|
) -> str:
|
||||||
raise GitFlowError("not implemented yet!")
|
raise GitFlowError("not implemented yet!")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user