diff --git a/src/main/python/ddadevops/application/release_mixin_services.py b/src/main/python/ddadevops/application/release_mixin_services.py index 22c904c..6b33e52 100644 --- a/src/main/python/ddadevops/application/release_mixin_services.py +++ b/src/main/python/ddadevops/application/release_mixin_services.py @@ -22,11 +22,12 @@ class PrepareReleaseService(): class TagAndPushReleaseService(): - def __init__(self, git_api: GitApi): + def __init__(self, git_api: GitApi, main_branch: str): self.git_api = git_api + self.main_branch = main_branch def tag_release(self, release_repo: ReleaseContextRepository): - annotation = 'v' + release_repo.get_release().version.get_version_string() + annotation = 'v' + release_repo.get_release(self.main_branch).version.get_version_string() message = 'Release ' + annotation self.git_api.tag_annotated_second_last(annotation, message) diff --git a/src/main/python/ddadevops/release_mixin.py b/src/main/python/ddadevops/release_mixin.py index 597ee6a..d30e6d5 100644 --- a/src/main/python/ddadevops/release_mixin.py +++ b/src/main/python/ddadevops/release_mixin.py @@ -24,7 +24,7 @@ class ReleaseMixin(DevopsBuild): self.release_repo = ReleaseContextRepository(version_repo, release_type_repo) self.prepare_release_service = PrepareReleaseService() - self.tag_and_push_release_service = TagAndPushReleaseService(git_api) + self.tag_and_push_release_service = TagAndPushReleaseService(git_api, self.main_branch) def prepare_release(self): release = self.release_repo.get_release(self.main_branch)