meissa/dda-devops-build
6
1
Fork 0
Code Issues Pull requests Projects Releases 33 Packages Wiki Activity

fix release validation

Browse source
This commit is contained in:
Michael Jerger 2023-07-07 08:48:43 +02:00
parent 34527621ac
commit 3260cc39b0
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -1,4 +1,4 @@
image: "domaindrivenarchitecture/devops-build:4.0.1" image: "domaindrivenarchitecture/devops-build:4.0.2"
before_script: before_script:
- python --version - python --version

5
src/main/python/ddadevops/domain/release.py
View file

@ -29,7 +29,6 @@ class Release(Validateable):
result = [] result = []
result += self.__validate_is_not_empty__("release_type") result += self.__validate_is_not_empty__("release_type")
result += self.__validate_is_not_empty__("release_main_branch") result += self.__validate_is_not_empty__("release_main_branch")
result += self.__validate_is_not_empty__("release_current_branch")
result += self.__validate_is_not_empty__("release_primary_build_file") result += self.__validate_is_not_empty__("release_primary_build_file")
result += self.__validate_is_not_empty__("version") result += self.__validate_is_not_empty__("version")
try: try:
@ -47,8 +46,10 @@ class Release(Validateable):
) )
if self.version: if self.version:
result += self.version.validate() result += self.version.validate()
if self.release_type is not None:
result += self.__validate_is_not_empty__("release_current_branch")
if ( if (
self.release_type is not None self.release_current_branch is not None
and self.release_type != ReleaseType.NONE and self.release_type != ReleaseType.NONE
and self.release_main_branch != self.release_current_branch and self.release_main_branch != self.release_current_branch
): ):