diff --git a/src/main/python/ddadevops/infrastructure/release_mixin/repo.py b/src/main/python/ddadevops/infrastructure/release_mixin/repo.py index 588118a..dc27457 100644 --- a/src/main/python/ddadevops/infrastructure/release_mixin/repo.py +++ b/src/main/python/ddadevops/infrastructure/release_mixin/repo.py @@ -63,41 +63,36 @@ class ReleaseTypeRepository: return release_type_repo def __get_release_type_git(self) -> ReleaseType | None: - latest_commit = self.git_api.get_latest_commit() - - match latest_commit.upper(): - case ReleaseType.MAJOR.name: - return ReleaseType.MAJOR - case ReleaseType.MINOR.name: - return ReleaseType.MINOR - case ReleaseType.PATCH.name: - return ReleaseType.PATCH - case ReleaseType.SNAPSHOT.name: - return ReleaseType.SNAPSHOT - case _: - return None + latest_commit = self.git_api.get_latest_commit().upper() + if ReleaseType.MAJOR.name in latest_commit: + return ReleaseType.MAJOR + if ReleaseType.MINOR.name in latest_commit: + return ReleaseType.MINOR + if ReleaseType.PATCH.name in latest_commit: + return ReleaseType.PATCH + if ReleaseType.SNAPSHOT.name in latest_commit: + return ReleaseType.SNAPSHOT + return None def __get_release_type_environment(self) -> ReleaseType | None: release_name = self.environment_api.get( EnvironmentKeys.DDADEVOPS_RELEASE_TYPE.name - ) + ).upper() if release_name is None: raise ValueError( "Release Name not found. Is the Environment correctly configured?" ) - match release_name.upper(): - case ReleaseType.MAJOR.name: - return ReleaseType.MAJOR - case ReleaseType.MINOR.name: - return ReleaseType.MINOR - case ReleaseType.PATCH.name: - return ReleaseType.PATCH - case ReleaseType.SNAPSHOT.name: - return ReleaseType.SNAPSHOT - case _: - return None + if ReleaseType.MAJOR.name in release_name: + return ReleaseType.MAJOR + if ReleaseType.MINOR.name in release_name: + return ReleaseType.MINOR + if ReleaseType.PATCH.name in release_name: + return ReleaseType.PATCH + if ReleaseType.SNAPSHOT.name in release_name: + return ReleaseType.SNAPSHOT + return None def get_release_type(self) -> ReleaseType | None: if self.get_from_git: