ScriptCollection 4.0.29__py3-none-any.whl → 4.0.34__py3-none-any.whl

ScriptCollection/AnionBuildPlatform.py

@@ -9,7 +9,6 @@ from .ScriptCollectionCore import ScriptCollectionCore
 
 class AnionBuildPlatformConfiguration:
     build_repositories_folder:str
-    project_to_build:str
     additional_arguments_file:str
     verbosity:LogLevel
     source_branch:str
@@ -18,14 +17,12 @@ class AnionBuildPlatformConfiguration:
 
     def __init__(self,
                  build_repositories_folder:str,
-                 project_to_build:str,
                  additional_arguments_file:str,
                  verbosity:LogLevel,
                  source_branch:str,
                  common_remote_name:str,
                  update_dependencies:bool):
         self.build_repositories_folder=build_repositories_folder
-        self.project_to_build=project_to_build
         self.additional_arguments_file=additional_arguments_file
         self.verbosity=verbosity
         self.source_branch=source_branch
@@ -46,11 +43,13 @@ class AnionBuildPlatform:
 
     def run(self) -> None:
         # Checkout source branch
-        build_repo_folder:str=os.path.join(self.__configuration.build_repositories_folder,self.__configuration.project_to_build+"Build")
+        build_repo_folder:str=self.__configuration.build_repositories_folder
+        GeneralUtilities.assert_condition(build_repo_folder.endswith("Build"),f"buildrepositoriesfolder {build_repo_folder} must end with 'Build'")
         self.__sc.assert_is_git_repository(build_repo_folder)
-        repository:str=os.path.join(self.__configuration,self.__configuration.project_to_build+"Build","Submodules",self.__configuration.project_to_build)
+        product_name=os.path.basename(build_repo_folder)[:-len("Build")]
+        repository:str=os.path.join(build_repo_folder,"Submodules",product_name)
         self.__sc.assert_is_git_repository(repository)
-        self.__sc.assert_no_uncommitted_changes(build_repo_folder)
+        self.__sc.git_commit(build_repo_folder,"Updated changes")
         self.__sc.git_checkout(repository,self.__configuration.source_branch)
 
         # Pull changes from remote
@@ -60,19 +59,61 @@ class AnionBuildPlatform:
 
         #Update dependencies
         if self.__configuration.update_dependencies:
-            self.__update_dependencies()
+            self.__update_dependencies(product_name)
         
         #Do release
         scripts_folder:str=os.path.join(build_repo_folder,"Scripts","CreateRelease")
-        self.__sc.run_program("python","MergeToMain.py",scripts_folder)
-        self.__sc.run_program("python","MergeToStable.py",scripts_folder)
+
+        merge_to_main_arguments=""
+        #if self.__configuration.project_to_build is not None:
+        #    merge_to_main_arguments+=f" --productname {self.__configuration.project_to_build}"
+        if self.__configuration.source_branch is not None:
+            merge_to_main_arguments+=f" --mergesourcebranch {self.__configuration.source_branch}"
+        #if self.__configuration.additional_arguments_file is not None:
+        #    merge_to_main_arguments+=f" --additionalargumentsfile {self.__configuration.additional_arguments_file}"
+        #if self.__configuration.main_branch is not None:
+        #    merge_to_main_arguments+=f" --mainbranch {self.__configuration.main_branch}"
+        #if self.__configuration.common_remote_name is not None:
+        #    merge_to_main_arguments+=f" --commonremotename {self.__configuration.common_remote_name}"
+        if self.__configuration.verbosity is not None:
+            merge_to_main_arguments+=f" --verbosity {self.__configuration.verbosity.value}"
+        self.__sc.run_program("python",f"MergeToMain.py{merge_to_main_arguments}",scripts_folder,print_live_output=True)
+
+        merge_to_stable_arguments=""
+        #if self.__configuration.project_to_build is not None:
+        #    merge_to_stable_arguments+=f" --productname {self.__configuration.project_to_build}"
+        #if self.__configuration.additional_arguments_file is not None:
+        #    merge_to_stable_arguments+=f" --additionalargumentsfile {self.__configuration.additional_arguments_file}"
+        #if self.__configuration.source_branch is not None:
+        #    merge_to_stable_arguments+=f" --sourcebranch {self.__configuration.source_branch}"
+        #if self.__configuration.main_branch is not None:
+        #    merge_to_stable_arguments+=f" --targetbranch {self.__configuration.main_branch}"
+        #if self.__configuration.reference_repo is not None:
+        #    merge_to_stable_arguments+=f" --referencerepo {self.__configuration.referencerepo}"
+        #if self.__configuration.common_remote_name is not None:
+        #    merge_to_stable_arguments+=f" --commonremotename {self.__configuration.common_remote_name}"
+        #if self.__configuration.build_repo_main_branch_name is not None:
+        #    merge_to_stable_arguments+=f" --buildrepomainbranchname {self.__configuration.build_repo_main_branch_name}"
+        #if self.__configuration.reference_repo_main_branch_name is not None:
+        #    merge_to_stable_arguments+=f" --referencerepomainbranchname {self.__configuration.reference_repo_main_branch_name}"
+        #if self.__configuration.reference_remote_name is not None:
+        #    merge_to_stable_arguments+=f" --referenceremotename {self.__configuration.reference_remote_name}"
+        #if self.__configuration.build_repo_remote_name is not None:
+        #    merge_to_stable_arguments+=f" --buildreporemotename {self.__configuration.build_repo_remote_name}"
+        #if self.__configuration.artifacts_target_folder is not None:
+        #    merge_to_stable_arguments+=f" --artifactstargetfolder {self.__configuration.artifacts_target_folder}"
+        #if self.__configuration.common_remote_url is not None:
+        #    merge_to_stable_arguments+=f" --commonremoteurl {self.__configuration.common_remote_url}"
+        if self.__configuration.verbosity is not None:
+            merge_to_stable_arguments+=f" --verbosity {self.__configuration.verbosity.value}"
+        self.__sc.run_program("python",f"MergeToStable.py{merge_to_stable_arguments}",scripts_folder,print_live_output=True)
 
         #prepare for next-release
         self.__sc.git_checkout(repository,self.__configuration.source_branch)
 
-    def __update_dependencies(self) -> None:
+    def __update_dependencies(self,product_name:str) -> None:
         self.__sc.log.log("Update dependencies...")
-        repository:str=os.path.join(self.__configuration,self.__configuration.project_to_build+"Build","Submodules",self.__configuration.project_to_build)
+        repository:str=os.path.join(self.__configuration,product_name+"Build","Submodules",product_name)
         self.__sc.assert_no_uncommitted_changes(repository)
         self.__sc.run_program("python","UpdateDependencies.py",os.path.join(repository,"Other","Scripts"))
         codeunits:list[str]=self._tFCPS_Tools_General.get_codeunits(repository)   
@@ -110,15 +151,16 @@ class AnionBuildPlatform:
 class TFCPS_AnionBuildPlatform_CLI:
 
     @staticmethod
-    def get_with_overwritable_defaults(default_project_to_build:str=None,default_loglevel:LogLevel=None,default_additionalargumentsfile:str=None,default_build_repositories_folder:str=None,default_source_branch:str=None,default_remote_name:str=None)->AnionBuildPlatform:
+    def get_with_overwritable_defaults(default_project_to_build:str=None,default_loglevel:LogLevel=None,default_additionalargumentsfile:str=None,default_build_repositories_folder:str=None,default_source_branch:str=None,default_main_branch:str=None,default_remote_name:str=None)->AnionBuildPlatform:
         parser = argparse.ArgumentParser()
         verbosity_values = ", ".join(f"{lvl.value}={lvl.name}" for lvl in LogLevel)
         parser.add_argument('-b', '--buildrepositoriesfolder', required=False,default=None)
         parser.add_argument('-p', '--projecttobuild', required=False, default=None)
         parser.add_argument('-a', '--additionalargumentsfile', required=False, default=None)
-        parser.add_argument('-v', '--verbosity', required=False, default=3, help=f"Sets the loglevel. Possible values: {verbosity_values}")
-        parser.add_argument('-s', '--sourcebranch', required=False, default="other/next-release")
-        parser.add_argument('-r', '--defaultremotename', required=False, default="origin")
+        parser.add_argument('-v', '--verbosity', required=False,  help=f"Sets the loglevel. Possible values: {verbosity_values}")
+        parser.add_argument('-s', '--sourcebranch', required=False)#other/next-release
+        parser.add_argument('-m', '--mainbranch', required=False)#main
+        parser.add_argument('-r', '--defaultremotename', required=False)#origin
         parser.add_argument('-u', '--updatedependencies', required=False, action='store_true', default=False)
         args=parser.parse_args()
 
@@ -128,16 +170,18 @@ class TFCPS_AnionBuildPlatform_CLI:
         if args.buildrepositoriesfolder is not None:
             default_build_repositories_folder=args.buildrepositoriesfolder
 
-        current_folder=os.getcwd()
+        scripts_folder=os.getcwd()
         
         if default_build_repositories_folder is None:
-            if os.path.basename(current_folder).endswith("Build"):
-                default_build_repositories_folder=os.path.dirname(current_folder)
+            parent_parent_folder=GeneralUtilities.resolve_relative_path("../..",scripts_folder)
+            if os.path.basename(parent_parent_folder).endswith("Build"):
+                default_build_repositories_folder=os.path.dirname(parent_parent_folder)
         GeneralUtilities.assert_not_null(default_build_repositories_folder,"buildrepositoriesfolder is not set")
         
         if default_project_to_build is None:
-            if os.path.basename(current_folder).endswith("Build"):
-                default_project_to_build=os.path.basename(current_folder)[:-len("Build")]
+            parent_parent_folder=GeneralUtilities.resolve_relative_path("../..",scripts_folder)
+            if os.path.basename(parent_parent_folder).endswith("Build"):
+                default_project_to_build=os.path.basename(parent_parent_folder)[:-len("Build")]
         GeneralUtilities.assert_not_null(default_project_to_build,"projecttobuild is not set")
 
         if args.verbosity is not None:
@@ -155,6 +199,6 @@ class TFCPS_AnionBuildPlatform_CLI:
             default_remote_name=args.defaultremotename
         GeneralUtilities.assert_not_null(default_remote_name,"defaultremotename is not set")
 
-        config:AnionBuildPlatformConfiguration=AnionBuildPlatformConfiguration(default_build_repositories_folder,default_project_to_build,default_additionalargumentsfile,default_loglevel,default_source_branch,default_remote_name,args.updatedependencies)
+        config:AnionBuildPlatformConfiguration=AnionBuildPlatformConfiguration(default_build_repositories_folder,default_additionalargumentsfile,default_loglevel,default_source_branch,default_remote_name,args.updatedependencies)
         tFCPS_MergeToMain:AnionBuildPlatform=AnionBuildPlatform(config)
         return tFCPS_MergeToMain

ScriptCollection/Executables.py

@@ -859,6 +859,6 @@ def CreateRelease()->int:
     arguments=f"CreateRelease.py --buildrepositoriesfolder {build_repo_folder} --verbosity {verbosity} --sourcebranch {args.sourcebranch}"
     if args.updatedependencies:
         arguments=arguments+" --updatedependencies"
-    sc.run_program("python", arguments, scripts_folder)
+    sc.run_program("python", arguments, scripts_folder,print_live_output=True)
 
     return 0

ScriptCollection/ScriptCollectionCore.py

@@ -36,7 +36,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "4.0.29"
+version = "4.0.34"
 __version__ = version
 
 

ScriptCollection/TFCPS/TFCPS_CreateRelease.py

@@ -17,7 +17,6 @@ class TFCPS_CreateReleaseConfiguration:
     build_repository:str
     repository:str
     reference_repository:str
-    reference_repo:str
     common_remote_name:str
     build_repo_main_branch_name:str
     reference_repo_main_branch_name:str
@@ -26,7 +25,7 @@ class TFCPS_CreateReleaseConfiguration:
     artifacts_target_folder:str
     common_remote_url:str
     
-    def __init__(self, current_file: str, product_name: str,branch_to_be_released:str,log_level:LogLevel,additional_arguments_file:str,main_branch:str,stable_branch:str,reference_repo:str,common_remote_name:str,build_repo_main_branch_name:str,reference_repo_main_branch_name:str,reference_remote_name:str,build_repo_remote_name:str,artifacts_target_folder:str,common_remote_url:str):
+    def __init__(self, current_file: str, product_name: str,branch_to_be_released:str,log_level:LogLevel,additional_arguments_file:str,main_branch:str,stable_branch:str,common_remote_name:str,build_repo_main_branch_name:str,reference_repo_main_branch_name:str,reference_remote_name:str,build_repo_remote_name:str,artifacts_target_folder:str,common_remote_url:str):
         self.product_name = product_name
         self.branch_to_be_released=branch_to_be_released
         self.additional_arguments_file=additional_arguments_file
@@ -36,7 +35,6 @@ class TFCPS_CreateReleaseConfiguration:
         self.build_repository=ScriptCollectionCore().search_repository_folder(current_file)
         self.repository=os.path.join(self.build_repository,"Submodules",product_name)
         self.reference_repository=os.path.join(self.build_repository,"Submodules",product_name+"Reference")
-        self.reference_repo=reference_repo
         self.common_remote_name=common_remote_name
         self.build_repo_main_branch_name=build_repo_main_branch_name
         self.reference_repo_main_branch_name=reference_repo_main_branch_name
@@ -87,8 +85,8 @@ class TFCPS_CreateRelease:
         if main_branch_commit_id == stable_branch_commit_id:
             self.sc.log.log("Merge to stable-branch will not be done because there are no changed which can be released.")
         else:
-            self.sc.log.log("Merge to stable-branch...",LogLevel.Information)
-            mergeToStableConfiguration:MergeToStableConfiguration=MergeToStableConfiguration(tfcps_CreateReleaseConfiguration.log_level,tfcps_CreateReleaseConfiguration.main_branch,tfcps_CreateReleaseConfiguration.stable_branch,tfcps_CreateReleaseConfiguration.repository,tfcps_CreateReleaseConfiguration.build_repository,tfcps_CreateReleaseConfiguration.reference_repo,tfcps_CreateReleaseConfiguration.common_remote_name,tfcps_CreateReleaseConfiguration.build_repo_main_branch_name,tfcps_CreateReleaseConfiguration.reference_repo_main_branch_name,tfcps_CreateReleaseConfiguration.reference_remote_name,tfcps_CreateReleaseConfiguration.build_repo_remote_name,tfcps_CreateReleaseConfiguration.artifacts_target_folder,tfcps_CreateReleaseConfiguration.product_name,tfcps_CreateReleaseConfiguration.common_remote_url,tfcps_CreateReleaseConfiguration.additional_arguments_file)
+            self.sc.log.log("Merge to stable-branch...",LogLevel.Information) 
+            mergeToStableConfiguration:MergeToStableConfiguration=MergeToStableConfiguration(tfcps_CreateReleaseConfiguration.log_level,tfcps_CreateReleaseConfiguration.main_branch,tfcps_CreateReleaseConfiguration.stable_branch,tfcps_CreateReleaseConfiguration.repository,tfcps_CreateReleaseConfiguration.build_repository,tfcps_CreateReleaseConfiguration.common_remote_name,tfcps_CreateReleaseConfiguration.build_repo_main_branch_name,tfcps_CreateReleaseConfiguration.reference_repo_main_branch_name,tfcps_CreateReleaseConfiguration.reference_remote_name,tfcps_CreateReleaseConfiguration.build_repo_remote_name,tfcps_CreateReleaseConfiguration.artifacts_target_folder,tfcps_CreateReleaseConfiguration.common_remote_url,tfcps_CreateReleaseConfiguration.additional_arguments_file)
             tFCPS_MergeToStable:TFCPS_MergeToStable=TFCPS_MergeToStable(mergeToStableConfiguration)
             tFCPS_MergeToStable.merge_to_stable_branch()
             

ScriptCollection/TFCPS/TFCPS_MergeToMain.py

@@ -80,16 +80,14 @@ class TFCPS_MergeToMain:
 class TFCPS_MergeToMain_CLI:
 
     @staticmethod
-    def get_with_overwritable_defaults(file:str,default_product_name:str=None,default_merge_source_branch:str=None,default_loglevel:LogLevel=None,default_additionalargumentsfile:str=None,default_main_branch:str=None,default_common_remote_name:str=None)->TFCPS_MergeToMain:
+    def get_with_overwritable_defaults(file:str,default_merge_source_branch:str=None,default_loglevel:LogLevel=None,default_additionalargumentsfile:str=None,default_main_branch:str=None,default_common_remote_name:str=None)->TFCPS_MergeToMain:
         parser = argparse.ArgumentParser()
         verbosity_values = ", ".join(f"{lvl.value}={lvl.name}" for lvl in LogLevel)
-        parser.add_argument('-n', '--productname', required=False,default=None)
         parser.add_argument('-s', '--mergesourcebranch', required=False)
-        parser.add_argument('-e', '--targetenvironmenttype', required=False, default="QualityCheck")
-        parser.add_argument('-a', '--additionalargumentsfile', required=False, default=None)
-        parser.add_argument('-t', '--mainbranch', required=False, default="main")
-        parser.add_argument('-r', '--commonremotename', required=False, default=None)
-        parser.add_argument('-v', '--verbosity', required=False, default=3, help=f"Sets the loglevel. Possible values: {verbosity_values}")
+        parser.add_argument('-a', '--additionalargumentsfile', required=False)
+        parser.add_argument('-t', '--mainbranch', required=False)
+        parser.add_argument('-r', '--commonremotename', required=False)
+        parser.add_argument('-v', '--verbosity', required=False, help=f"Sets the loglevel. Possible values: {verbosity_values}")
         args=parser.parse_args()
 
         sc:ScriptCollectionCore=ScriptCollectionCore()
@@ -97,11 +95,7 @@ class TFCPS_MergeToMain_CLI:
         build_repo=GeneralUtilities.resolve_relative_path("../../..",file)
         sc.assert_is_git_repository(build_repo)
 
-        if args.productname is not None: 
-            default_product_name=args.productname
-        if default_product_name is None:
-            default_product_name=os.path.basename(build_repo)[:-len("Build")]
-        GeneralUtilities.assert_not_null(default_product_name,"productname is not set")
+        default_product_name=os.path.basename(build_repo)[:-len("Build")]
 
         if args.mergesourcebranch is not None: 
             default_merge_source_branch=args.mergesourcebranch#other/next-release
@@ -109,7 +103,7 @@ class TFCPS_MergeToMain_CLI:
 
         if args.verbosity is not None:
             default_loglevel=LogLevel(int( args.verbosity))
-        GeneralUtilities.assert_not_null(default_merge_source_branch,"verbosity is not set")
+        GeneralUtilities.assert_not_null(default_loglevel,"verbosity is not set")
 
         if args.additionalargumentsfile is not None:
             default_additionalargumentsfile=args.additionalargumentsfile

ScriptCollection/TFCPS/TFCPS_MergeToStable.py

@@ -17,31 +17,27 @@ class MergeToStableConfiguration:
     target_branch:str#stable
     repository:str
     build_repo:str
-    reference_repo:str
     common_remote_name:str
     build_repo_main_branch_name:str
     reference_repo_main_branch_name:str
     reference_remote_name:str
     build_repo_remote_name:str
     artifacts_target_folder:str
-    product_name:str
     common_remote_url:str
     additional_arguments_file:str
 
-    def __init__(self,loglevel:LogLevel,source_branch:str,target_branch:str,repository:str,build_repo:str,reference_repo:str,common_remote_name:str,build_repo_main_branch_name:str,reference_repo_main_branch_name:str,reference_remote_name:str,build_repo_remote_name:str,artifacts_target_folder:str,product_name:str,common_remote_url:str,additional_arguments_file:str):
+    def __init__(self,loglevel:LogLevel,source_branch:str,target_branch:str,repository:str,build_repo:str,common_remote_name:str,build_repo_main_branch_name:str,reference_repo_main_branch_name:str,reference_remote_name:str,build_repo_remote_name:str,artifacts_target_folder:str,common_remote_url:str,additional_arguments_file:str):
         self.log_level=loglevel
         self.source_branch=source_branch
         self.target_branch=target_branch
         self.repository=repository
         self.build_repo=build_repo
-        self.reference_repo=reference_repo
         self.common_remote_name=common_remote_name
         self.build_repo_main_branch_name=build_repo_main_branch_name
         self.reference_repo_main_branch_name=reference_repo_main_branch_name
         self.reference_remote_name=reference_remote_name
         self.build_repo_remote_name=build_repo_remote_name
         self.artifacts_target_folder=artifacts_target_folder
-        self.product_name=product_name
         self.common_remote_url=common_remote_url
         self.additional_arguments_file=additional_arguments_file
 
@@ -60,7 +56,7 @@ class TFCPS_MergeToStable:
     def merge_to_stable_branch(self):
         self.sc.log.loglevel=self.createRelease_configuration.log_level
         self.sc.log.log("Merge to stable-branch...") 
-        product_name:str=self.createRelease_configuration.product_name
+        product_name:str=os.path.basename(self.createRelease_configuration.repository)
 
         GeneralUtilities.assert_condition(self.sc.git_get_commit_id(self.createRelease_configuration.repository,self.createRelease_configuration.source_branch)!=self.sc.git_get_commit_id(self.createRelease_configuration.repository,self.createRelease_configuration.target_branch),"Source- and target-branch must not be the same commit.")
 
@@ -69,8 +65,9 @@ class TFCPS_MergeToStable:
         self.sc.git_checkout(self.createRelease_configuration.repository, self.createRelease_configuration.source_branch)
         self.sc.assert_no_uncommitted_changes(self.createRelease_configuration.repository)
 
-        self.sc.assert_is_git_repository(self.createRelease_configuration.reference_repo)
-        self.sc.assert_no_uncommitted_changes(self.createRelease_configuration.reference_repo)
+        reference_repo=self.createRelease_configuration.repository+"Reference"
+        self.sc.assert_is_git_repository(reference_repo)
+        self.sc.assert_no_uncommitted_changes(reference_repo)
 
         self.sc.assert_is_git_repository(self.createRelease_configuration.build_repo)
         self.sc.assert_no_uncommitted_changes(self.createRelease_configuration.build_repo)
@@ -96,7 +93,7 @@ class TFCPS_MergeToStable:
                 GeneralUtilities.ensure_directory_exists(target_folder)
                 codeunit_version:str=self.tFCPS_Tools_General.get_version_of_codeunit(os.path.join(self.createRelease_configuration.repository,codeunit,f"{codeunit}.codeunit.xml"))
                 target_file:str=os.path.join(target_folder,f"{codeunit}.v{codeunit_version}.Artifacts.zip")
-                self.sc.run_program("tar",f"-cf {target_file} -C {source_folder} .")
+                self.sc.run_program_argsasarray("tar",[f"-cf",target_file,"-C",source_folder, "."])
 
             #push artifacts
             push_script:str=os.path.join( self.createRelease_configuration.build_repo,"Scripts","CreateRelease",f"PushArtifacts.{codeunit}.py")
@@ -108,7 +105,7 @@ class TFCPS_MergeToStable:
 
             # update codeunit-reference
             self.sc.log.log(f"Release artifacts of codeunit {codeunit}...")
-            reference_folder:str=os.path.join(self.createRelease_configuration.reference_repo,"ReferenceContent")
+            reference_folder:str=os.path.join(reference_repo,"ReferenceContent")
             repository:str=self.createRelease_configuration.repository
             project_version:str=self.tFCPS_Tools_General.get_version_of_project(repository)
             projectname:str=self.createRelease_configuration.product_name
@@ -119,33 +116,33 @@ class TFCPS_MergeToStable:
             self.__export_codeunit_reference_content_to_reference_repository("Latest", True, reference_folder, repository, codeunit, projectname, codeunit_version, public_repository_url, main_branch_name)
 
             # Generate reference
-            self.__generate_entire_reference(projectname, project_version, reference_folder)
+            self.__generate_entire_reference(projectname, project_version, reference_folder,reference_repo)
             
         self.sc.log.log("Finishing merging to stable...")
-        self.sc.git_commit(self.createRelease_configuration.reference_repo,f"Added reference for v{project_version}")
+        self.sc.git_commit(reference_repo,f"Added reference for v{project_version}")
         
         self.sc.git_merge(self.createRelease_configuration.repository, self.createRelease_configuration.source_branch,self.createRelease_configuration.target_branch, True,True,None,True,True)
         
         self.sc.assert_no_uncommitted_changes(self.createRelease_configuration.repository)
-        self.sc.assert_no_uncommitted_changes(self.createRelease_configuration.reference_repo)
+        self.sc.assert_no_uncommitted_changes(reference_repo)
         self.sc.git_commit(self.createRelease_configuration.build_repo,"Updated submodules")
 
         self.sc.git_push_with_retry(self.createRelease_configuration.repository,self.createRelease_configuration.common_remote_name,self.createRelease_configuration.source_branch,self.createRelease_configuration.source_branch)
         self.sc.git_push_with_retry(self.createRelease_configuration.repository,self.createRelease_configuration.common_remote_name,self.createRelease_configuration.target_branch,self.createRelease_configuration.target_branch)
         self.sc.git_push_with_retry(self.createRelease_configuration.build_repo,self.createRelease_configuration.build_repo_remote_name,self.createRelease_configuration.build_repo_main_branch_name,self.createRelease_configuration.build_repo_main_branch_name)
-        self.sc.git_push_with_retry(self.createRelease_configuration.reference_repo,self.createRelease_configuration.reference_remote_name,self.createRelease_configuration.reference_repo_main_branch_name,self.createRelease_configuration.reference_repo_main_branch_name)
+        self.sc.git_push_with_retry(reference_repo,self.createRelease_configuration.reference_remote_name,self.createRelease_configuration.reference_repo_main_branch_name,self.createRelease_configuration.reference_repo_main_branch_name)
 
-    def __remove_outdated_version(self):
+    def __remove_outdated_version(self,reference_repo:str):
         now = GeneralUtilities.get_now()
         for unsupported_version in self.tFCPS_Tools_General.get_unsupported_versions(self.createRelease_configuration.repository, now):
-            unsupported_reference_folder = f"{self.createRelease_configuration.reference_repo}/ReferenceContent/v{unsupported_version[0]}"
+            unsupported_reference_folder = f"{reference_repo}/ReferenceContent/v{unsupported_version[0]}"
             GeneralUtilities.ensure_directory_does_not_exist(unsupported_reference_folder)
 
         
     @GeneralUtilities.check_arguments
-    def __generate_entire_reference(self, projectname: str, project_version: str, reference_folder: str) -> None:
+    def __generate_entire_reference(self, projectname: str, project_version: str, reference_folder: str,reference_repo:str) -> None:
         self.sc.log.log("Remove outdated versions...")
-        self.__remove_outdated_version()
+        self.__remove_outdated_version(reference_repo)
         self.sc.log.log("Generate reference...")
         all_available_version_identifier_folders_of_reference: list[str] = list(folder for folder in GeneralUtilities.get_direct_folders_of_folder(reference_folder))
         all_available_version_identifier_folders_of_reference = sorted(all_available_version_identifier_folders_of_reference, key=cmp_to_key(TFCPS_Tools_General.sort_reference_folder))
@@ -280,22 +277,21 @@ class TFCPS_MergeToStable:
 class TFCPS_MergeToStable_CLI:
 
     @staticmethod
-    def get_with_overwritable_defaults(file:str,default_product_name:str=None,default_loglevel:LogLevel=None,default_source_branch:str=None,default_additionalargumentsfile:str=None,default_target_branch:str=None,default_reference_repo:str=None,common_remote_name:str=None,build_repo_main_branch_name:str=None,reference_repo_main_branch_name:str=None,reference_remote_name:str=None,build_repo_remote_name:str=None,artifacts_target_folder:str=None,common_remote_url:str=None)->TFCPS_MergeToMain:
+    def get_with_overwritable_defaults(file:str,default_loglevel:LogLevel=None,default_source_branch:str=None,default_additionalargumentsfile:str=None,default_target_branch:str=None,common_remote_name:str=None,build_repo_main_branch_name:str=None,reference_repo_main_branch_name:str=None,reference_remote_name:str=None,build_repo_remote_name:str=None,artifacts_target_folder:str=None,common_remote_url:str=None)->TFCPS_MergeToMain:
         parser = argparse.ArgumentParser()
         verbosity_values = ", ".join(f"{lvl.value}={lvl.name}" for lvl in LogLevel)
-        parser.add_argument('-n', '--productname', required=False,default=None)
         parser.add_argument('-a', '--additionalargumentsfile', required=False, default=None)
-        parser.add_argument('-s', '--sourcebranch', required=False, default="main")
-        parser.add_argument('-t', '--targetbranch', required=False, default="stable")
+        parser.add_argument('-s', '--sourcebranch', required=False)#default="main"
+        parser.add_argument('-t', '--targetbranch', required=False)#default="stable"
         parser.add_argument( '--referencerepo', required=False, default=None)
         parser.add_argument( '--commonremotename', required=False, default=None)
-        parser.add_argument( '--buildrepomainbranchname', required=False, default="main")
-        parser.add_argument( '--referencerepomainbranchname', required=False, default="main")
+        parser.add_argument( '--buildrepomainbranchname', required=False)#default="main"
+        parser.add_argument( '--referencerepomainbranchname', required=False)#default="main"
         parser.add_argument( '--referenceremotename', required=False, default=None)
         parser.add_argument( '--buildreporemotename', required=False, default=None)
         parser.add_argument( '--artifactstargetfolder', required=False, default=None)
         parser.add_argument( '--commonremoteurl', required=False, default=None)
-        parser.add_argument('-v', '--verbosity', required=False, default=3, help=f"Sets the loglevel. Possible values: {verbosity_values}")
+        parser.add_argument('-v', '--verbosity', required=False, help=f"Sets the loglevel. Possible values: {verbosity_values}")
         args=parser.parse_args()
 
         sc:ScriptCollectionCore=ScriptCollectionCore()
@@ -303,11 +299,7 @@ class TFCPS_MergeToStable_CLI:
         build_repo=GeneralUtilities.resolve_relative_path("../../..",file)
         sc.assert_is_git_repository(build_repo)
 
-        if args.productname is not None: 
-            default_product_name=args.productname
-        if default_product_name is None:
-            default_product_name=os.path.basename(build_repo)[:-len("Build")]
-        GeneralUtilities.assert_not_null(default_product_name,"productname is not set")
+        default_product_name=os.path.basename(build_repo)[:-len("Build")]
 
         if args.verbosity is not None:
             default_loglevel=LogLevel(int( args.verbosity))
@@ -323,12 +315,6 @@ class TFCPS_MergeToStable_CLI:
         if args.targetbranch is not None:
             default_target_branch=args.targetbranch
         GeneralUtilities.assert_not_null(default_target_branch,"targetbranch is not set")
-
-        if args.referencerepo is not None:
-            default_reference_repo=args.referencerepo
-        if default_reference_repo is None:
-            default_reference_repo=os.path.join(build_repo,"Submodules",f"{default_product_name}Reference")
-        GeneralUtilities.assert_not_null(default_reference_repo,"referencerepo is not set")
         
         if args.commonremotename is not None:
             common_remote_name=args.commonremotename
@@ -358,6 +344,6 @@ class TFCPS_MergeToStable_CLI:
         GeneralUtilities.assert_not_null(common_remote_url,"commonremoteurl is not set")
 
         repository=os.path.join(build_repo,"Submodules",default_product_name)
-        config:MergeToStableConfiguration=MergeToStableConfiguration(default_loglevel,default_source_branch,default_target_branch,repository,build_repo,default_reference_repo,common_remote_name,build_repo_main_branch_name,reference_repo_main_branch_name,reference_remote_name,build_repo_remote_name,artifacts_target_folder,default_product_name,common_remote_url,default_additionalargumentsfile)
+        config:MergeToStableConfiguration=MergeToStableConfiguration(default_loglevel,default_source_branch,default_target_branch,repository,build_repo,common_remote_name,build_repo_main_branch_name,reference_repo_main_branch_name,reference_remote_name,build_repo_remote_name,artifacts_target_folder,common_remote_url,default_additionalargumentsfile)
         tFCPS_MergeToMain:TFCPS_MergeToStable=TFCPS_MergeToStable(config)
         return tFCPS_MergeToMain

ScriptCollection/TFCPS/TFCPS_Tools_General.py

@@ -1087,3 +1087,19 @@ class TFCPS_Tools_General:
             GeneralUtilities.ensure_file_exists(file)
             GeneralUtilities.append_line_to_file(file, "Version;SupportBegin;SupportEnd")
         GeneralUtilities.append_line_to_file(file, f"{version_of_product};{GeneralUtilities.datetime_to_string(supported_from)};{GeneralUtilities.datetime_to_string(supported_until)}")
+
+
+    @GeneralUtilities.check_arguments
+    def add_github_release(self, productname: str, projectversion: str, build_artifacts_folder: str, github_username: str, repository_folder: str, additional_attached_files: list[str]) -> None:
+        self.__sc.assert_is_git_repository(repository_folder)
+        self.__sc.log.log(f"Create GitHub-release for {productname}...")
+        github_repo = f"{github_username}/{productname}"
+        artifact_files = []
+        codeunits = self.get_codeunits(repository_folder)
+        for codeunit in codeunits:
+            artifact_files.append(self.__sc.find_file_by_extension(f"{build_artifacts_folder}/{productname}/{projectversion}/{codeunit}", "Productive.Artifacts.zip"))
+        if additional_attached_files is not None:
+            for additional_attached_file in additional_attached_files:
+                artifact_files.append(additional_attached_file)
+        changelog_file = os.path.join(repository_folder, "Other", "Resources", "Changelog", f"v{projectversion}.md")
+        self.__sc.run_program_argsasarray("gh", ["release", "create", f"v{projectversion}", "--repo",  github_repo, "--notes-file", changelog_file, "--title", f"Release v{projectversion}"]+artifact_files)

{scriptcollection-4.0.29.dist-info → scriptcollection-4.0.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 4.0.29
+Version: 4.0.34
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke

{scriptcollection-4.0.29.dist-info → scriptcollection-4.0.34.dist-info}/RECORD

@@ -1,6 +1,6 @@
-ScriptCollection/AnionBuildPlatform.py,sha256=zji-jrb51Ur455O_JmHaHuUmp-RdzHSG_qxljzuw2Dk,8895
+ScriptCollection/AnionBuildPlatform.py,sha256=57bEfg-AKkSzdZ81JyAJZ48dw4nhZioCqGrFMkp_fWk,12501
 ScriptCollection/CertificateUpdater.py,sha256=GXPxmYaW-ufOqsiP9kUYdtI6eNg1-GzrrCqsZdwW_HY,9199
-ScriptCollection/Executables.py,sha256=7Tsbk-1Oy-lgigyKQz5JGux_d5A5dBcRZG7OBBjPR6I,41868
+ScriptCollection/Executables.py,sha256=31RgdqQDRBpY955m9NSBms5M15jwHAMQFBBtUwKbSME,41891
 ScriptCollection/GeneralUtilities.py,sha256=9Xd9aKPj3TkpVtdHXzFMILrRoXAfJCph69XRTstdsBo,49280
 ScriptCollection/ImageUpdater.py,sha256=qTe3yoqzQJY7LZdXBbjbWvrsSQaeHy1VwmOxaRzU2ig,29305
 ScriptCollection/ProcessesRunner.py,sha256=3mu4ZxzZleQo0Op6o9EYTCFiJfb6kx5ov2YfZfT89mU,1395
@@ -9,18 +9,18 @@ ScriptCollection/ProgramRunnerEpew.py,sha256=TJdDx9zIMSiCaXh8X-ekrMlbXfGtmd0Mmyx
 ScriptCollection/ProgramRunnerMock.py,sha256=uTu-aFle1W_oKjeQEmuPsFPQpvo0kRf2FrRjAPIwT5Y,37
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/SCLog.py,sha256=dxGOI4E9lG5v9jk_LajXCkM5nghliCDV8YB8Ihn160s,4541
-ScriptCollection/ScriptCollectionCore.py,sha256=sYPWLsPSeTYeVebLrmL6NEtQwt7fUo_ytLdZRfzKv2I,140598
+ScriptCollection/ScriptCollectionCore.py,sha256=T7qnI3TQjEKhZDIuAk1N9bcWquCaBUyn53MINb88KVE,140598
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=Cj89Xhzf5CRSDVH_-0JachQMsPHfjkz8jtRi_BpiGvY,25979
 ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=4rYKgTAga11NiDx8YUqz3K_Q4eX_n3kC6lvNdXEa24s,7389
 ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=DGaQk85r8P5ANDhga9pEcTiJSRpZrDykfUOFhJR-bYY,5551
-ScriptCollection/TFCPS/TFCPS_CreateRelease.py,sha256=d8L1WR2Fx-Ps-5So5fbR_fwTrSKosgzwXHu_wJUtyc8,6510
+ScriptCollection/TFCPS/TFCPS_CreateRelease.py,sha256=bcJlfI062Eoq7MOIhun-_iNG7SdO1ZIuC_cylaoLI1s,6332
 ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=O-0guM_LJCcZmPZJhMgTvXD2RXUJEBWWv6Bt6hDFhvM,1943
-ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=wX7oF_JYATofrJNQ7XtPKCg8cjr_XSAmE-Dn0BseaNo,7746
-ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=AhmDhGx_eS7LzkRvp_RyIJz9yuj00mvuDNyqWzo26u0,22682
+ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=41g219jaBRZ2VQCrWM4-Trvervrt8b5oATPwIIGNpag,7244
+ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=MQvfHe2kUzf9c_NiPqTWOWIGuurjLTgOqa5SsTt-ndE,21699
 ScriptCollection/TFCPS/TFCPS_PreBuildCodeunitsScript.py,sha256=CxdwUklhZVuJGp0vcokoH_KMXFzmlUlZwj77xFYijho,2242
 ScriptCollection/TFCPS/TFCPS_Tools_Dependencies.py,sha256=o7HI3ki3WWqlAiUsrh3Lky_w6UhYh9hdjYPGOhubQGA,414
-ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=Ueji9NKGK5ABhb3iWwFWtXDx-z-eS3h9GVDoxU51Ah0,68256
+ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=PmS034kSaSeL2P_h-6nWi_-RsPmKS08NGk51EfmDeEU,69477
 ScriptCollection/TFCPS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=-g8h2gCf9rh0KJXUBeQD5d0qLJgBU3Q8DNZXM1UXC04,5259
 ScriptCollection/TFCPS/Docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,8 +35,8 @@ ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=dnuDlQXThF
 ScriptCollection/TFCPS/NodeJS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=q7msAxCb5VIZ-xhFg1MfzUvWomQRKYldqmW42KFhyMU,6868
 ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-4.0.29.dist-info/METADATA,sha256=N4ln3jWftWLDJ2zEtdylMeHZzd5Gv5NQu0q85a9HYYg,7688
-scriptcollection-4.0.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-4.0.29.dist-info/entry_points.txt,sha256=NeU26D6q7d8n2cmKQiOvHK21w1C7D2kxoNRJaKiyZ5w,4295
-scriptcollection-4.0.29.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-4.0.29.dist-info/RECORD,,
+scriptcollection-4.0.34.dist-info/METADATA,sha256=UV6dfp9wWH4jRxEjV6psN77JBoCFfjRwVpEvQVuD1cs,7688
+scriptcollection-4.0.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-4.0.34.dist-info/entry_points.txt,sha256=NeU26D6q7d8n2cmKQiOvHK21w1C7D2kxoNRJaKiyZ5w,4295
+scriptcollection-4.0.34.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-4.0.34.dist-info/RECORD,,