ScriptCollection 4.2.129__py3-none-any.whl → 4.2.131__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- ScriptCollection/AnionBuildPlatform.py +9 -9
- ScriptCollection/GeneralUtilities.py +4 -4
- ScriptCollection/OCIImages/OCIImageManager.py +216 -216
- ScriptCollection/ProcessesRunner.py +2 -2
- ScriptCollection/ProgramRunnerSudo.py +110 -110
- ScriptCollection/SCLog.py +6 -6
- ScriptCollection/ScriptCollectionCore.py +3706 -3706
- ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py +2 -2
- ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py +3 -3
- ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py +8 -8
- ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py +352 -352
- ScriptCollection/TFCPS/TFCPS_CreateRelease.py +18 -18
- ScriptCollection/TFCPS/TFCPS_Generic.py +44 -44
- ScriptCollection/TFCPS/TFCPS_MergeToMain.py +128 -128
- ScriptCollection/TFCPS/TFCPS_MergeToStable.py +355 -355
- ScriptCollection/TFCPS/TFCPS_PreBuildCodeunitsScript.py +6 -6
- ScriptCollection/TFCPS/TFCPS_Tools_General.py +51 -15
- ScriptCollection/UnassignedVariablesCheck.py +94 -0
- {scriptcollection-4.2.129.dist-info → scriptcollection-4.2.131.dist-info}/METADATA +1 -1
- {scriptcollection-4.2.129.dist-info → scriptcollection-4.2.131.dist-info}/RECORD +23 -22
- {scriptcollection-4.2.129.dist-info → scriptcollection-4.2.131.dist-info}/WHEEL +0 -0
- {scriptcollection-4.2.129.dist-info → scriptcollection-4.2.131.dist-info}/entry_points.txt +0 -0
- {scriptcollection-4.2.129.dist-info → scriptcollection-4.2.131.dist-info}/top_level.txt +0 -0
|
@@ -9,22 +9,22 @@ from .TFCPS_MergeToStable import TFCPS_MergeToStable,MergeToStableConfiguration
|
|
|
9
9
|
|
|
10
10
|
class TFCPS_CreateReleaseConfiguration:
|
|
11
11
|
|
|
12
|
-
product_name: str
|
|
13
|
-
branch_to_be_released:str
|
|
14
|
-
additional_arguments_file:str
|
|
15
|
-
log_level:LogLevel
|
|
16
|
-
main_branch:str
|
|
17
|
-
stable_branch:str
|
|
18
|
-
build_repository:str
|
|
19
|
-
repository:str
|
|
20
|
-
reference_repository:str
|
|
21
|
-
common_remote_name:str
|
|
22
|
-
build_repo_main_branch_name:str
|
|
23
|
-
reference_repo_main_branch_name:str
|
|
24
|
-
reference_remote_name:str
|
|
25
|
-
build_repo_remote_name:str
|
|
26
|
-
artifacts_target_folder:str
|
|
27
|
-
common_remote_url:str
|
|
12
|
+
product_name: str = None
|
|
13
|
+
branch_to_be_released:str = None
|
|
14
|
+
additional_arguments_file:str = None
|
|
15
|
+
log_level:LogLevel = None
|
|
16
|
+
main_branch:str = None
|
|
17
|
+
stable_branch:str = None
|
|
18
|
+
build_repository:str = None
|
|
19
|
+
repository:str = None
|
|
20
|
+
reference_repository:str = None
|
|
21
|
+
common_remote_name:str = None
|
|
22
|
+
build_repo_main_branch_name:str = None
|
|
23
|
+
reference_repo_main_branch_name:str = None
|
|
24
|
+
reference_remote_name:str = None
|
|
25
|
+
build_repo_remote_name:str = None
|
|
26
|
+
artifacts_target_folder:str = None
|
|
27
|
+
common_remote_url:str = None
|
|
28
28
|
|
|
29
29
|
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):
|
|
30
30
|
self.product_name = product_name
|
|
@@ -46,8 +46,8 @@ class TFCPS_CreateReleaseConfiguration:
|
|
|
46
46
|
|
|
47
47
|
class TFCPS_CreateRelease:
|
|
48
48
|
|
|
49
|
-
sc:ScriptCollectionCore
|
|
50
|
-
tFCPS_Tools_General:TFCPS_Tools_General
|
|
49
|
+
sc:ScriptCollectionCore = None
|
|
50
|
+
tFCPS_Tools_General:TFCPS_Tools_General = None
|
|
51
51
|
|
|
52
52
|
def __init__(self):
|
|
53
53
|
self.sc=ScriptCollectionCore()
|
|
@@ -1,44 +1,44 @@
|
|
|
1
|
-
import argparse
|
|
2
|
-
from ..ScriptCollectionCore import ScriptCollectionCore
|
|
3
|
-
from ..SCLog import LogLevel
|
|
4
|
-
from .TFCPS_Tools_General import TFCPS_Tools_General
|
|
5
|
-
|
|
6
|
-
class TFCPS_Generic_Functions:
|
|
7
|
-
script_file:str
|
|
8
|
-
repository_folder:str=None
|
|
9
|
-
targetenvironmenttype:str
|
|
10
|
-
additionalargumentsfile:str
|
|
11
|
-
verbosity:LogLevel
|
|
12
|
-
sc:ScriptCollectionCore
|
|
13
|
-
tfcps_Tools_General:TFCPS_Tools_General
|
|
14
|
-
__use_cache:bool
|
|
15
|
-
|
|
16
|
-
def __init__(self,script_file:str,targetenvironmenttype:str,additionalargumentsfile:str,verbosity:LogLevel,use_cache:bool):
|
|
17
|
-
self.verbosity=verbosity
|
|
18
|
-
self.script_file=script_file
|
|
19
|
-
self.sc=ScriptCollectionCore()
|
|
20
|
-
self.sc.log.loglevel=self.verbosity
|
|
21
|
-
self.tfcps_Tools_General=TFCPS_Tools_General(self.sc)
|
|
22
|
-
self.repository_folder=self.sc.search_repository_folder(script_file)
|
|
23
|
-
self.targetenvironmenttype=targetenvironmenttype
|
|
24
|
-
self.__use_cache=use_cache
|
|
25
|
-
self.additionalargumentsfile=additionalargumentsfile
|
|
26
|
-
|
|
27
|
-
def use_cache(self)->bool:
|
|
28
|
-
return self.__use_cache
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
class TFCPS_Generic_CLI:
|
|
32
|
-
|
|
33
|
-
@staticmethod
|
|
34
|
-
def parse(file:str)->TFCPS_Generic_Functions:
|
|
35
|
-
parser = argparse.ArgumentParser()
|
|
36
|
-
verbosity_values = ", ".join(f"{lvl.value}={lvl.name}" for lvl in LogLevel)
|
|
37
|
-
parser.add_argument('-r', '--repository', required=False, default=None)
|
|
38
|
-
parser.add_argument('-e', '--targetenvironmenttype', required=False, default="QualityCheck")
|
|
39
|
-
parser.add_argument('-a', '--additionalargumentsfile', required=False, default=None)
|
|
40
|
-
parser.add_argument('-v', '--verbosity', required=False, default=3, help=f"Sets the loglevel. Possible values: {verbosity_values}")
|
|
41
|
-
parser.add_argument('-c', '--nocache', action='store_true', required=False, default=False)
|
|
42
|
-
args=parser.parse_args()
|
|
43
|
-
result:TFCPS_Generic_Functions=TFCPS_Generic_Functions(file,args.targetenvironmenttype,args.additionalargumentsfile,LogLevel(int(args.verbosity)),not args.nocache)
|
|
44
|
-
return result
|
|
1
|
+
import argparse
|
|
2
|
+
from ..ScriptCollectionCore import ScriptCollectionCore
|
|
3
|
+
from ..SCLog import LogLevel
|
|
4
|
+
from .TFCPS_Tools_General import TFCPS_Tools_General
|
|
5
|
+
|
|
6
|
+
class TFCPS_Generic_Functions:
|
|
7
|
+
script_file:str = None
|
|
8
|
+
repository_folder:str=None
|
|
9
|
+
targetenvironmenttype:str = None
|
|
10
|
+
additionalargumentsfile:str = None
|
|
11
|
+
verbosity:LogLevel = None
|
|
12
|
+
sc:ScriptCollectionCore = None
|
|
13
|
+
tfcps_Tools_General:TFCPS_Tools_General = None
|
|
14
|
+
__use_cache:bool = None
|
|
15
|
+
|
|
16
|
+
def __init__(self,script_file:str,targetenvironmenttype:str,additionalargumentsfile:str,verbosity:LogLevel,use_cache:bool):
|
|
17
|
+
self.verbosity=verbosity
|
|
18
|
+
self.script_file=script_file
|
|
19
|
+
self.sc=ScriptCollectionCore()
|
|
20
|
+
self.sc.log.loglevel=self.verbosity
|
|
21
|
+
self.tfcps_Tools_General=TFCPS_Tools_General(self.sc)
|
|
22
|
+
self.repository_folder=self.sc.search_repository_folder(script_file)
|
|
23
|
+
self.targetenvironmenttype=targetenvironmenttype
|
|
24
|
+
self.__use_cache=use_cache
|
|
25
|
+
self.additionalargumentsfile=additionalargumentsfile
|
|
26
|
+
|
|
27
|
+
def use_cache(self)->bool:
|
|
28
|
+
return self.__use_cache
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
class TFCPS_Generic_CLI:
|
|
32
|
+
|
|
33
|
+
@staticmethod
|
|
34
|
+
def parse(file:str)->TFCPS_Generic_Functions:
|
|
35
|
+
parser = argparse.ArgumentParser()
|
|
36
|
+
verbosity_values = ", ".join(f"{lvl.value}={lvl.name}" for lvl in LogLevel)
|
|
37
|
+
parser.add_argument('-r', '--repository', required=False, default=None)
|
|
38
|
+
parser.add_argument('-e', '--targetenvironmenttype', required=False, default="QualityCheck")
|
|
39
|
+
parser.add_argument('-a', '--additionalargumentsfile', required=False, default=None)
|
|
40
|
+
parser.add_argument('-v', '--verbosity', required=False, default=3, help=f"Sets the loglevel. Possible values: {verbosity_values}")
|
|
41
|
+
parser.add_argument('-c', '--nocache', action='store_true', required=False, default=False)
|
|
42
|
+
args=parser.parse_args()
|
|
43
|
+
result:TFCPS_Generic_Functions=TFCPS_Generic_Functions(file,args.targetenvironmenttype,args.additionalargumentsfile,LogLevel(int(args.verbosity)),not args.nocache)
|
|
44
|
+
return result
|
|
@@ -1,128 +1,128 @@
|
|
|
1
|
-
import argparse
|
|
2
|
-
import os
|
|
3
|
-
from ..GeneralUtilities import GeneralUtilities
|
|
4
|
-
from ..SCLog import LogLevel
|
|
5
|
-
from ..ScriptCollectionCore import ScriptCollectionCore
|
|
6
|
-
from .TFCPS_Tools_General import TFCPS_Tools_General
|
|
7
|
-
from .TFCPS_CodeUnit_BuildCodeUnits import TFCPS_CodeUnit_BuildCodeUnits
|
|
8
|
-
from .TFCPS_Generic import TFCPS_Generic_Functions
|
|
9
|
-
|
|
10
|
-
class MergeToMainConfiguration:
|
|
11
|
-
product_name: str
|
|
12
|
-
merge_source_branch:str
|
|
13
|
-
additional_arguments_file:str
|
|
14
|
-
log_level:LogLevel
|
|
15
|
-
main_branch:str
|
|
16
|
-
repository_folder:str
|
|
17
|
-
tFCPS_Generic_Functions:TFCPS_Generic_Functions
|
|
18
|
-
common_remote_name:str
|
|
19
|
-
build_repo:str
|
|
20
|
-
sc:ScriptCollectionCore=ScriptCollectionCore()
|
|
21
|
-
|
|
22
|
-
def __init__(self, current_file: str,repository:str, product_name: str,merge_source_branch:str,log_level:LogLevel,additional_arguments_file:str,main_branch:str,common_remote_name:str,build_repo:str):
|
|
23
|
-
self.sc.log.loglevel=log_level
|
|
24
|
-
self.repository_folder = repository
|
|
25
|
-
self.product_name = product_name
|
|
26
|
-
self.merge_source_branch=merge_source_branch
|
|
27
|
-
self.additional_arguments_file=additional_arguments_file
|
|
28
|
-
self.log_level=log_level
|
|
29
|
-
self.main_branch=main_branch
|
|
30
|
-
self.common_remote_name=common_remote_name
|
|
31
|
-
self.build_repo=build_repo
|
|
32
|
-
|
|
33
|
-
class TFCPS_MergeToMain:
|
|
34
|
-
|
|
35
|
-
sc:ScriptCollectionCore
|
|
36
|
-
tFCPS_Tools_General:TFCPS_Tools_General
|
|
37
|
-
generic_prepare_new_release_arguments:MergeToMainConfiguration=None
|
|
38
|
-
|
|
39
|
-
def __init__(self,generic_prepare_new_release_arguments:MergeToMainConfiguration):
|
|
40
|
-
self.sc=ScriptCollectionCore()
|
|
41
|
-
self.tFCPS_Tools_General=TFCPS_Tools_General(self.sc)
|
|
42
|
-
self.generic_prepare_new_release_arguments=generic_prepare_new_release_arguments
|
|
43
|
-
|
|
44
|
-
@GeneralUtilities.check_arguments
|
|
45
|
-
def merge_to_main_branch(self ) -> None:
|
|
46
|
-
self.sc.log.loglevel=self.generic_prepare_new_release_arguments.log_level
|
|
47
|
-
self.sc.log.log("Merge to main-branch...")
|
|
48
|
-
fast_forward_source_branch: bool=True
|
|
49
|
-
source_branch: str=self.generic_prepare_new_release_arguments.merge_source_branch
|
|
50
|
-
target_branch: str=self.generic_prepare_new_release_arguments.main_branch
|
|
51
|
-
self.sc.assert_is_git_repository(self.generic_prepare_new_release_arguments.repository_folder)
|
|
52
|
-
|
|
53
|
-
if self.sc.git_get_commit_id(self.generic_prepare_new_release_arguments.repository_folder,source_branch)==self.sc.git_get_commit_id(self.generic_prepare_new_release_arguments.repository_folder,target_branch):
|
|
54
|
-
self.sc.log.log("Source- and target-branch are on the same commit.")
|
|
55
|
-
return
|
|
56
|
-
|
|
57
|
-
self.sc.assert_no_uncommitted_changes(self.generic_prepare_new_release_arguments.repository_folder)
|
|
58
|
-
self.sc.git_checkout(self.generic_prepare_new_release_arguments.repository_folder, source_branch)
|
|
59
|
-
self.sc.assert_no_uncommitted_changes(self.generic_prepare_new_release_arguments.repository_folder)
|
|
60
|
-
|
|
61
|
-
#premerge-build
|
|
62
|
-
#TODO the premerge-build is now supposed to be in MergeToStable
|
|
63
|
-
try:
|
|
64
|
-
tfcps_CodeUnit_BuildCodeUnits:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(self.generic_prepare_new_release_arguments.repository_folder,self.sc.log.loglevel,"QualityCheck",self.generic_prepare_new_release_arguments.additional_arguments_file,False,True,False)
|
|
65
|
-
tfcps_CodeUnit_BuildCodeUnits.build_codeunits()
|
|
66
|
-
except Exception:
|
|
67
|
-
self.sc.log.log(f"Branch {source_branch} is not buildable.",LogLevel.Error)
|
|
68
|
-
self.sc.git_undo_all_changes(self.generic_prepare_new_release_arguments.repository_folder)
|
|
69
|
-
raise
|
|
70
|
-
self.sc.git_commit(self.generic_prepare_new_release_arguments.repository_folder, 'Pre-merge-commit', stage_all_changes=True, no_changes_behavior=0)
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
if fast_forward_source_branch:
|
|
74
|
-
self.sc.git_checkout(self.generic_prepare_new_release_arguments.repository_folder, source_branch)
|
|
75
|
-
project_version:str=self.tFCPS_Tools_General.get_version_of_project(self.generic_prepare_new_release_arguments.repository_folder)
|
|
76
|
-
self.sc.git_merge(self.generic_prepare_new_release_arguments.repository_folder, source_branch, target_branch, False, True)
|
|
77
|
-
self.sc.git_merge(self.generic_prepare_new_release_arguments.repository_folder, target_branch, source_branch, True, True)
|
|
78
|
-
self.sc.git_create_tag(self.generic_prepare_new_release_arguments.repository_folder,target_branch,f"v{project_version}")
|
|
79
|
-
|
|
80
|
-
self.sc.log.log("Push branches...")
|
|
81
|
-
self.sc.git_push_with_retry(self.generic_prepare_new_release_arguments.repository_folder,self.generic_prepare_new_release_arguments.common_remote_name,source_branch,source_branch)
|
|
82
|
-
self.sc.git_push_with_retry(self.generic_prepare_new_release_arguments.repository_folder,self.generic_prepare_new_release_arguments.common_remote_name,target_branch,target_branch)
|
|
83
|
-
self.sc.git_commit(self.generic_prepare_new_release_arguments.build_repo,"Updated submodule")
|
|
84
|
-
|
|
85
|
-
class TFCPS_MergeToMain_CLI:
|
|
86
|
-
|
|
87
|
-
@staticmethod
|
|
88
|
-
@GeneralUtilities.check_arguments
|
|
89
|
-
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:
|
|
90
|
-
parser = argparse.ArgumentParser()
|
|
91
|
-
verbosity_values = ", ".join(f"{lvl.value}={lvl.name}" for lvl in LogLevel)
|
|
92
|
-
parser.add_argument('-s', '--mergesourcebranch', required=False)
|
|
93
|
-
parser.add_argument('-a', '--additionalargumentsfile', required=False)
|
|
94
|
-
parser.add_argument('-t', '--mainbranch', required=False)
|
|
95
|
-
parser.add_argument('-r', '--commonremotename', required=False)
|
|
96
|
-
parser.add_argument('-v', '--verbosity', required=False, help=f"Sets the loglevel. Possible values: {verbosity_values}")
|
|
97
|
-
args=parser.parse_args()
|
|
98
|
-
|
|
99
|
-
sc:ScriptCollectionCore=ScriptCollectionCore()
|
|
100
|
-
|
|
101
|
-
build_repo=GeneralUtilities.resolve_relative_path("../../..",file)
|
|
102
|
-
sc.assert_is_git_repository(build_repo)
|
|
103
|
-
|
|
104
|
-
default_product_name=os.path.basename(build_repo)[:-len("Build")]
|
|
105
|
-
|
|
106
|
-
if args.mergesourcebranch is not None:
|
|
107
|
-
default_merge_source_branch=args.mergesourcebranch#other/next-release
|
|
108
|
-
GeneralUtilities.assert_not_null(default_merge_source_branch,"mergesourcebranch is not set")
|
|
109
|
-
|
|
110
|
-
if args.verbosity is not None:
|
|
111
|
-
default_loglevel=LogLevel(int( args.verbosity))
|
|
112
|
-
GeneralUtilities.assert_not_null(default_loglevel,"verbosity is not set")
|
|
113
|
-
|
|
114
|
-
if args.additionalargumentsfile is not None:
|
|
115
|
-
default_additionalargumentsfile=args.additionalargumentsfile
|
|
116
|
-
|
|
117
|
-
if args.mainbranch is not None:
|
|
118
|
-
default_main_branch=args.mainbranch#main
|
|
119
|
-
GeneralUtilities.assert_not_null(default_main_branch,"mainbranch is not set")
|
|
120
|
-
|
|
121
|
-
if args.commonremotename is not None:
|
|
122
|
-
default_common_remote_name=args.commonremotename
|
|
123
|
-
GeneralUtilities.assert_not_null(default_common_remote_name,"commonremotename is not set")
|
|
124
|
-
|
|
125
|
-
repository=os.path.join(build_repo,"Submodules",default_product_name)
|
|
126
|
-
config:MergeToMainConfiguration=MergeToMainConfiguration(file,repository,default_product_name,default_merge_source_branch,default_loglevel,default_additionalargumentsfile,default_main_branch,default_common_remote_name,build_repo)
|
|
127
|
-
tFCPS_MergeToMain:TFCPS_MergeToMain=TFCPS_MergeToMain(config)
|
|
128
|
-
return tFCPS_MergeToMain
|
|
1
|
+
import argparse
|
|
2
|
+
import os
|
|
3
|
+
from ..GeneralUtilities import GeneralUtilities
|
|
4
|
+
from ..SCLog import LogLevel
|
|
5
|
+
from ..ScriptCollectionCore import ScriptCollectionCore
|
|
6
|
+
from .TFCPS_Tools_General import TFCPS_Tools_General
|
|
7
|
+
from .TFCPS_CodeUnit_BuildCodeUnits import TFCPS_CodeUnit_BuildCodeUnits
|
|
8
|
+
from .TFCPS_Generic import TFCPS_Generic_Functions
|
|
9
|
+
|
|
10
|
+
class MergeToMainConfiguration:
|
|
11
|
+
product_name: str = None
|
|
12
|
+
merge_source_branch:str = None
|
|
13
|
+
additional_arguments_file:str = None
|
|
14
|
+
log_level:LogLevel = None
|
|
15
|
+
main_branch:str = None
|
|
16
|
+
repository_folder:str = None
|
|
17
|
+
tFCPS_Generic_Functions:TFCPS_Generic_Functions = None
|
|
18
|
+
common_remote_name:str = None
|
|
19
|
+
build_repo:str = None
|
|
20
|
+
sc:ScriptCollectionCore=ScriptCollectionCore()
|
|
21
|
+
|
|
22
|
+
def __init__(self, current_file: str,repository:str, product_name: str,merge_source_branch:str,log_level:LogLevel,additional_arguments_file:str,main_branch:str,common_remote_name:str,build_repo:str):
|
|
23
|
+
self.sc.log.loglevel=log_level
|
|
24
|
+
self.repository_folder = repository
|
|
25
|
+
self.product_name = product_name
|
|
26
|
+
self.merge_source_branch=merge_source_branch
|
|
27
|
+
self.additional_arguments_file=additional_arguments_file
|
|
28
|
+
self.log_level=log_level
|
|
29
|
+
self.main_branch=main_branch
|
|
30
|
+
self.common_remote_name=common_remote_name
|
|
31
|
+
self.build_repo=build_repo
|
|
32
|
+
|
|
33
|
+
class TFCPS_MergeToMain:
|
|
34
|
+
|
|
35
|
+
sc:ScriptCollectionCore = None
|
|
36
|
+
tFCPS_Tools_General:TFCPS_Tools_General = None
|
|
37
|
+
generic_prepare_new_release_arguments:MergeToMainConfiguration=None
|
|
38
|
+
|
|
39
|
+
def __init__(self,generic_prepare_new_release_arguments:MergeToMainConfiguration):
|
|
40
|
+
self.sc=ScriptCollectionCore()
|
|
41
|
+
self.tFCPS_Tools_General=TFCPS_Tools_General(self.sc)
|
|
42
|
+
self.generic_prepare_new_release_arguments=generic_prepare_new_release_arguments
|
|
43
|
+
|
|
44
|
+
@GeneralUtilities.check_arguments
|
|
45
|
+
def merge_to_main_branch(self ) -> None:
|
|
46
|
+
self.sc.log.loglevel=self.generic_prepare_new_release_arguments.log_level
|
|
47
|
+
self.sc.log.log("Merge to main-branch...")
|
|
48
|
+
fast_forward_source_branch: bool=True
|
|
49
|
+
source_branch: str=self.generic_prepare_new_release_arguments.merge_source_branch
|
|
50
|
+
target_branch: str=self.generic_prepare_new_release_arguments.main_branch
|
|
51
|
+
self.sc.assert_is_git_repository(self.generic_prepare_new_release_arguments.repository_folder)
|
|
52
|
+
|
|
53
|
+
if self.sc.git_get_commit_id(self.generic_prepare_new_release_arguments.repository_folder,source_branch)==self.sc.git_get_commit_id(self.generic_prepare_new_release_arguments.repository_folder,target_branch):
|
|
54
|
+
self.sc.log.log("Source- and target-branch are on the same commit.")
|
|
55
|
+
return
|
|
56
|
+
|
|
57
|
+
self.sc.assert_no_uncommitted_changes(self.generic_prepare_new_release_arguments.repository_folder)
|
|
58
|
+
self.sc.git_checkout(self.generic_prepare_new_release_arguments.repository_folder, source_branch)
|
|
59
|
+
self.sc.assert_no_uncommitted_changes(self.generic_prepare_new_release_arguments.repository_folder)
|
|
60
|
+
|
|
61
|
+
#premerge-build
|
|
62
|
+
#TODO the premerge-build is now supposed to be in MergeToStable
|
|
63
|
+
try:
|
|
64
|
+
tfcps_CodeUnit_BuildCodeUnits:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(self.generic_prepare_new_release_arguments.repository_folder,self.sc.log.loglevel,"QualityCheck",self.generic_prepare_new_release_arguments.additional_arguments_file,False,True,False)
|
|
65
|
+
tfcps_CodeUnit_BuildCodeUnits.build_codeunits()
|
|
66
|
+
except Exception:
|
|
67
|
+
self.sc.log.log(f"Branch {source_branch} is not buildable.",LogLevel.Error)
|
|
68
|
+
self.sc.git_undo_all_changes(self.generic_prepare_new_release_arguments.repository_folder)
|
|
69
|
+
raise
|
|
70
|
+
self.sc.git_commit(self.generic_prepare_new_release_arguments.repository_folder, 'Pre-merge-commit', stage_all_changes=True, no_changes_behavior=0)
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
if fast_forward_source_branch:
|
|
74
|
+
self.sc.git_checkout(self.generic_prepare_new_release_arguments.repository_folder, source_branch)
|
|
75
|
+
project_version:str=self.tFCPS_Tools_General.get_version_of_project(self.generic_prepare_new_release_arguments.repository_folder)
|
|
76
|
+
self.sc.git_merge(self.generic_prepare_new_release_arguments.repository_folder, source_branch, target_branch, False, True)
|
|
77
|
+
self.sc.git_merge(self.generic_prepare_new_release_arguments.repository_folder, target_branch, source_branch, True, True)
|
|
78
|
+
self.sc.git_create_tag(self.generic_prepare_new_release_arguments.repository_folder,target_branch,f"v{project_version}")
|
|
79
|
+
|
|
80
|
+
self.sc.log.log("Push branches...")
|
|
81
|
+
self.sc.git_push_with_retry(self.generic_prepare_new_release_arguments.repository_folder,self.generic_prepare_new_release_arguments.common_remote_name,source_branch,source_branch)
|
|
82
|
+
self.sc.git_push_with_retry(self.generic_prepare_new_release_arguments.repository_folder,self.generic_prepare_new_release_arguments.common_remote_name,target_branch,target_branch)
|
|
83
|
+
self.sc.git_commit(self.generic_prepare_new_release_arguments.build_repo,"Updated submodule")
|
|
84
|
+
|
|
85
|
+
class TFCPS_MergeToMain_CLI:
|
|
86
|
+
|
|
87
|
+
@staticmethod
|
|
88
|
+
@GeneralUtilities.check_arguments
|
|
89
|
+
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:
|
|
90
|
+
parser = argparse.ArgumentParser()
|
|
91
|
+
verbosity_values = ", ".join(f"{lvl.value}={lvl.name}" for lvl in LogLevel)
|
|
92
|
+
parser.add_argument('-s', '--mergesourcebranch', required=False)
|
|
93
|
+
parser.add_argument('-a', '--additionalargumentsfile', required=False)
|
|
94
|
+
parser.add_argument('-t', '--mainbranch', required=False)
|
|
95
|
+
parser.add_argument('-r', '--commonremotename', required=False)
|
|
96
|
+
parser.add_argument('-v', '--verbosity', required=False, help=f"Sets the loglevel. Possible values: {verbosity_values}")
|
|
97
|
+
args=parser.parse_args()
|
|
98
|
+
|
|
99
|
+
sc:ScriptCollectionCore=ScriptCollectionCore()
|
|
100
|
+
|
|
101
|
+
build_repo=GeneralUtilities.resolve_relative_path("../../..",file)
|
|
102
|
+
sc.assert_is_git_repository(build_repo)
|
|
103
|
+
|
|
104
|
+
default_product_name=os.path.basename(build_repo)[:-len("Build")]
|
|
105
|
+
|
|
106
|
+
if args.mergesourcebranch is not None:
|
|
107
|
+
default_merge_source_branch=args.mergesourcebranch#other/next-release
|
|
108
|
+
GeneralUtilities.assert_not_null(default_merge_source_branch,"mergesourcebranch is not set")
|
|
109
|
+
|
|
110
|
+
if args.verbosity is not None:
|
|
111
|
+
default_loglevel=LogLevel(int( args.verbosity))
|
|
112
|
+
GeneralUtilities.assert_not_null(default_loglevel,"verbosity is not set")
|
|
113
|
+
|
|
114
|
+
if args.additionalargumentsfile is not None:
|
|
115
|
+
default_additionalargumentsfile=args.additionalargumentsfile
|
|
116
|
+
|
|
117
|
+
if args.mainbranch is not None:
|
|
118
|
+
default_main_branch=args.mainbranch#main
|
|
119
|
+
GeneralUtilities.assert_not_null(default_main_branch,"mainbranch is not set")
|
|
120
|
+
|
|
121
|
+
if args.commonremotename is not None:
|
|
122
|
+
default_common_remote_name=args.commonremotename
|
|
123
|
+
GeneralUtilities.assert_not_null(default_common_remote_name,"commonremotename is not set")
|
|
124
|
+
|
|
125
|
+
repository=os.path.join(build_repo,"Submodules",default_product_name)
|
|
126
|
+
config:MergeToMainConfiguration=MergeToMainConfiguration(file,repository,default_product_name,default_merge_source_branch,default_loglevel,default_additionalargumentsfile,default_main_branch,default_common_remote_name,build_repo)
|
|
127
|
+
tFCPS_MergeToMain:TFCPS_MergeToMain=TFCPS_MergeToMain(config)
|
|
128
|
+
return tFCPS_MergeToMain
|