From 92081947c5395a9102d3a4598b92029e27868837 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Fri, 21 Apr 2023 15:11:33 +0200 Subject: [PATCH] going to merge Release & ReleaseConfig [skip-ci] --- src/main/python/ddadevops/domain/release.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/python/ddadevops/domain/release.py b/src/main/python/ddadevops/domain/release.py index a2b1e0c..883bb20 100644 --- a/src/main/python/ddadevops/domain/release.py +++ b/src/main/python/ddadevops/domain/release.py @@ -74,15 +74,18 @@ class ReleaseConfig(Validateable): ): self.main_branch = main_branch self.config_file = config_file + # TODO: this information may be transient? self.release_version = release_version self.bump_version = bump_version + self.devops = devops -class Release(): - def __init__(self, release_type: ReleaseType | None, version: Version, current_branch: str): +class Release(Validateable): + def __init__(self, release_type: ReleaseType | None, version: Version, current_branch: str, main_branch: str): self.release_type = release_type self.version = version self.current_branch = current_branch + self.main_branch = main_branch def release_version(self): return self.version.create_release_version(self.release_type) @@ -90,11 +93,9 @@ class Release(): def bump_version(self): return self.release_version().create_bump_version() - def validate(self, main_branch): + def validate(self): result = [] - if self.release_type is not None and main_branch != self.current_branch: + if self.release_type is not None and self.main_branch != self.current_branch: result.append(f"Releases are allowed only on {main_branch}") return result - def is_valid(self, main_branch): - return len(self.validate(main_branch)) < 1 # TODO: Use abstract is_valid in Validatable