fix release init

This commit is contained in:
Michael Jerger 2023-06-26 09:35:40 +02:00
parent bff63e45fd
commit cd52a009f3
3 changed files with 26 additions and 4 deletions

View file

@ -13,8 +13,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from os import environ
from pybuilder.core import init, task, use_plugin, Author
from ddadevops import *
from pybuilder.core import init, use_plugin, Author
use_plugin("python.core") use_plugin("python.core")
use_plugin("copy_resources") use_plugin("copy_resources")
@ -28,7 +30,9 @@ use_plugin("python.distutils")
default_task = "publish" default_task = "publish"
name = "ddadevops" name = "ddadevops"
version = "4.0.0-dev71" MODULE = "not-used"
PROJECT_ROOT_PATH = "."
version = "4.0.0-dev72"
summary = "tools to support builds combining gopass, terraform, dda-pallet, aws & hetzner-cloud" summary = "tools to support builds combining gopass, terraform, dda-pallet, aws & hetzner-cloud"
description = __doc__ description = __doc__
authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")] authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")]
@ -40,6 +44,7 @@ license = "Apache Software License"
def initialize(project): def initialize(project):
#project.build_depends_on('mockito') #project.build_depends_on('mockito')
#project.build_depends_on('unittest-xml-reporting') #project.build_depends_on('unittest-xml-reporting')
project.build_depends_on("ddadevops>=4.0.0-dev")
project.set_property("verbose", True) project.set_property("verbose", True)
project.get_property("filter_resources_glob").append("main/python/ddadevops/__init__.py") project.get_property("filter_resources_glob").append("main/python/ddadevops/__init__.py")
@ -73,3 +78,20 @@ def initialize(project):
'Topic :: Software Development :: Quality Assurance', 'Topic :: Software Development :: Quality Assurance',
'Topic :: Software Development :: Testing' 'Topic :: Software Development :: Testing'
]) ])
input = {
"name": name,
"module": MODULE,
"stage": "notused",
"project_root_path": PROJECT_ROOT_PATH,
"build_types": [],
"mixin_types": ["RELEASE"],
"release_primary_build_file": "build.py",
}
build = ReleaseMixin(project, input)
build.initialize_build_dir()
@task
def nothing(project):
pass

View file

@ -95,7 +95,8 @@ class InitService:
ReleaseType.NONE.name, ReleaseType.NONE.name,
]: ]:
release_type = latest_commit release_type = latest_commit
result["release_type"] = release_type if release_type:
result["release_type"] = release_type
result["release_current_branch"] = self.git_api.get_current_branch() result["release_current_branch"] = self.git_api.get_current_branch()
if not tag: if not tag:

View file

@ -58,7 +58,6 @@ def test_devops_factory():
"project_root_path": "../../..", "project_root_path": "../../..",
"build_types": [], "build_types": [],
"mixin_types": ["RELEASE"], "mixin_types": ["RELEASE"],
"release_type": "NONE",
"release_main_branch": "main", "release_main_branch": "main",
"release_current_branch": "my_feature", "release_current_branch": "my_feature",
"release_config_file": "project.clj", "release_config_file": "project.clj",