mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-26 09:32:01 +00:00
Backport #64039 to 24.3: Do not create new release in release branch automatically
This commit is contained in:
parent
dcb26df0f5
commit
d3a9c83f70
@ -398,7 +398,7 @@ class Release:
|
|||||||
def _bump_release_branch(self):
|
def _bump_release_branch(self):
|
||||||
# Update only git, original version stays the same
|
# Update only git, original version stays the same
|
||||||
self._git.update()
|
self._git.update()
|
||||||
new_version = self.version.patch_update()
|
new_version = self.version.copy()
|
||||||
version_type = self.get_stable_release_type()
|
version_type = self.get_stable_release_type()
|
||||||
pr_labels = "--label release"
|
pr_labels = "--label release"
|
||||||
if version_type == VersionType.LTS:
|
if version_type == VersionType.LTS:
|
||||||
@ -424,9 +424,10 @@ class Release:
|
|||||||
"changes with it.'",
|
"changes with it.'",
|
||||||
dry_run=self.dry_run,
|
dry_run=self.dry_run,
|
||||||
)
|
)
|
||||||
with self._create_gh_release(False):
|
# Here the release branch part is done.
|
||||||
# Here the release branch part is done
|
# We don't create a release itself automatically to have a
|
||||||
yield
|
# safe window to backport possible bug fixes.
|
||||||
|
yield
|
||||||
|
|
||||||
@contextmanager
|
@contextmanager
|
||||||
def _bump_version_in_master(self, helper_branch: str) -> Iterator[None]:
|
def _bump_version_in_master(self, helper_branch: str) -> Iterator[None]:
|
||||||
|
@ -165,6 +165,21 @@ class ClickHouseVersion:
|
|||||||
self._description = version_type
|
self._description = version_type
|
||||||
self._describe = f"v{self.string}-{version_type}"
|
self._describe = f"v{self.string}-{version_type}"
|
||||||
|
|
||||||
|
def copy(self) -> "ClickHouseVersion":
|
||||||
|
copy = ClickHouseVersion(
|
||||||
|
self.major,
|
||||||
|
self.minor,
|
||||||
|
self.patch,
|
||||||
|
self.revision,
|
||||||
|
self._git,
|
||||||
|
str(self.tweak),
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
copy.with_description(self.description)
|
||||||
|
except ValueError:
|
||||||
|
pass
|
||||||
|
return copy
|
||||||
|
|
||||||
def __eq__(self, other: Any) -> bool:
|
def __eq__(self, other: Any) -> bool:
|
||||||
if not isinstance(self, type(other)):
|
if not isinstance(self, type(other)):
|
||||||
return NotImplemented
|
return NotImplemented
|
||||||
|
Loading…
Reference in New Issue
Block a user