ScriptCollection 4.3.10__py3-none-any.whl → 4.3.11__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/ScriptCollectionCore.py +2 -3
- ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py +28 -2
- {scriptcollection-4.3.10.dist-info → scriptcollection-4.3.11.dist-info}/METADATA +1 -1
- {scriptcollection-4.3.10.dist-info → scriptcollection-4.3.11.dist-info}/RECORD +7 -7
- {scriptcollection-4.3.10.dist-info → scriptcollection-4.3.11.dist-info}/WHEEL +0 -0
- {scriptcollection-4.3.10.dist-info → scriptcollection-4.3.11.dist-info}/entry_points.txt +0 -0
- {scriptcollection-4.3.10.dist-info → scriptcollection-4.3.11.dist-info}/top_level.txt +0 -0
|
@@ -37,7 +37,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
|
|
|
37
37
|
from .ProgramRunnerPopen import ProgramRunnerPopen
|
|
38
38
|
from .SCLog import SCLog, LogLevel
|
|
39
39
|
|
|
40
|
-
version = "4.3.
|
|
40
|
+
version = "4.3.11"
|
|
41
41
|
__version__ = version
|
|
42
42
|
|
|
43
43
|
class VSCodeWorkspaceShellTask:
|
|
@@ -584,8 +584,7 @@ class ScriptCollectionCore:
|
|
|
584
584
|
argument.append("--force")
|
|
585
585
|
if (pushalltags):
|
|
586
586
|
argument.append("--tags")
|
|
587
|
-
|
|
588
|
-
return result[1].replace('\r', '').replace('\n', '')
|
|
587
|
+
self.run_program_argsasarray("git", argument, folder, throw_exception_if_exitcode_is_not_zero=True, print_errors_as_information=True)
|
|
589
588
|
|
|
590
589
|
@GeneralUtilities.check_arguments
|
|
591
590
|
def git_pull_with_retry(self, folder: str, remote: str, localbranchname: str, remotebranchname: str, force: bool = False, amount_of_attempts: int = 5) -> None:
|
|
@@ -2,6 +2,7 @@ import os
|
|
|
2
2
|
import json
|
|
3
3
|
import re
|
|
4
4
|
import socket
|
|
5
|
+
import uuid
|
|
5
6
|
from datetime import datetime, timedelta,timezone
|
|
6
7
|
import xmlschema
|
|
7
8
|
import yaml
|
|
@@ -161,17 +162,42 @@ class TFCPS_CodeUnit_BuildCodeUnits:
|
|
|
161
162
|
if GeneralUtilities.string_has_content(self.additionalargumentsfile):
|
|
162
163
|
scbuildcodeunits_arguments += ["-a", self.__translate_path_into_container(self.additionalargumentsfile, container_repository_folder)]
|
|
163
164
|
|
|
165
|
+
#if the repository is a git-submodule then "<repository>/.git" is not a directory but a pointer-file referencing a gitdir which
|
|
166
|
+
#lies outside the mounted working-tree (for example "<product>Build/.git/modules/Submodules/<product>"). git inside the container
|
|
167
|
+
#can not resolve that gitdir, so "git rev-parse --verify HEAD" fails and the version-detection silently falls back to a wrong
|
|
168
|
+
#default-version. To fix this regardless of where the submodule is located in the base-repository, the resolved real gitdir is
|
|
169
|
+
#mounted into the container at a dedicated path and the pointer-file is replaced (file-over-file mount) by a generated one that
|
|
170
|
+
#references that in-container path. GIT_WORK_TREE overrides the "core.worktree" of the submodule-gitdir (which still points at the
|
|
171
|
+
#original, now wrong, location). For a normal repository (own ".git"-directory) nothing additional is required.
|
|
172
|
+
git_dir_docker_arguments: list[str] = []
|
|
173
|
+
staged_git_pointer_file: str = None
|
|
174
|
+
if os.path.isfile(os.path.join(self.repository, ".git")):
|
|
175
|
+
real_git_folder = self.sc.get_real_git_folder(self.repository)
|
|
176
|
+
container_git_dir = "/Workspace/RepositoryGitDir"
|
|
177
|
+
staged_git_pointer_file = os.path.join(GeneralUtilities.get_temp_folder(), f"sc-container-gitpointer-{uuid.uuid4()}")
|
|
178
|
+
GeneralUtilities.write_text_to_file(staged_git_pointer_file, f"gitdir: {container_git_dir}\n")
|
|
179
|
+
git_dir_docker_arguments = [
|
|
180
|
+
"-v", f"{real_git_folder}:{container_git_dir}",
|
|
181
|
+
"-v", f"{staged_git_pointer_file}:{container_repository_folder}/.git",
|
|
182
|
+
"-e", f"GIT_WORK_TREE={container_repository_folder}",
|
|
183
|
+
]
|
|
184
|
+
|
|
164
185
|
#run scbuildcodeunits inside the SCBuilder-image. the repository is mounted into the container and the docker-socket is forwarded because codeunit-builds often start containers (for example local test-services).
|
|
165
186
|
docker_arguments = [
|
|
166
187
|
"run", "--rm",
|
|
167
188
|
"-v", f"{self.repository}:{container_repository_folder}",
|
|
168
189
|
"-v", "/var/run/docker.sock:/var/run/docker.sock",
|
|
190
|
+
] + git_dir_docker_arguments + [
|
|
169
191
|
"-w", container_repository_folder,
|
|
170
192
|
image,
|
|
171
193
|
] + scbuildcodeunits_arguments
|
|
172
194
|
self.sc.log.log(f"Build codeunits in container using image \"{image}\"...")
|
|
173
|
-
|
|
174
|
-
|
|
195
|
+
try:
|
|
196
|
+
# the exitcode is evaluated by the caller (returned as part of the result-tuple), so the program-runner must not raise on a non-zero exitcode here.
|
|
197
|
+
result=self.sc.run_program_argsasarray("docker", docker_arguments, throw_exception_if_exitcode_is_not_zero=False, print_live_output=True)
|
|
198
|
+
finally:
|
|
199
|
+
if staged_git_pointer_file is not None:
|
|
200
|
+
GeneralUtilities.ensure_file_does_not_exist(staged_git_pointer_file)
|
|
175
201
|
exit_code:int=result[0]
|
|
176
202
|
stdout:str=result[1] or GeneralUtilities.empty_string
|
|
177
203
|
stderr:str=result[2] or GeneralUtilities.empty_string
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: scriptcollection
|
|
3
|
-
Version: 4.3.
|
|
3
|
+
Version: 4.3.11
|
|
4
4
|
Summary: The ScriptCollection is the place for reusable scripts.
|
|
5
5
|
Author-email: Marius Göcke <marius.goecke@gmail.com>
|
|
6
6
|
Project-URL: Homepage, https://github.com/anionDev/ScriptCollection
|
|
@@ -9,7 +9,7 @@ ScriptCollection/ProgramRunnerMock.py,sha256=uTu-aFle1W_oKjeQEmuPsFPQpvo0kRf2FrR
|
|
|
9
9
|
ScriptCollection/ProgramRunnerPopen.py,sha256=zVD-gZY85o8wiGFcpYAGNDl-tXaKzipl1Bkhqy2ois4,4681
|
|
10
10
|
ScriptCollection/ProgramRunnerSudo.py,sha256=RXsiceQ8W6a8YDk_2BPscVbIAmDIpIxqe9WHBy2r4CM,5233
|
|
11
11
|
ScriptCollection/SCLog.py,sha256=Z-HhC_CRtU3HdQflNsabFh9IJOucHcXmxMDcf58fli0,4671
|
|
12
|
-
ScriptCollection/ScriptCollectionCore.py,sha256=
|
|
12
|
+
ScriptCollection/ScriptCollectionCore.py,sha256=Itir0fINdaGBknmtfsh7L52uTQh4NvtwGpa5Vg4uwq8,230165
|
|
13
13
|
ScriptCollection/UnassignedVariablesCheck.py,sha256=v59qLQ5RRvx31ouuCW7NWZj3McWENvGBPkV5ZGBmqJE,4344
|
|
14
14
|
ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
15
15
|
ScriptCollection/OCIImages/AbstractImageHandler.py,sha256=o129UYDtLymCRjMZBP9Puaj19ueMHoNt6UTLspfnaRc,1758
|
|
@@ -35,7 +35,7 @@ ScriptCollection/Resources/MaintenanceSite/MaintenanceSite.html,sha256=CX9S1bdOz
|
|
|
35
35
|
ScriptCollection/TFCPS/SCTaskRunnerServer.py,sha256=rpuwSsQ6YQfZS2LGnvOH5ql8zs_-cHU4LQttS7XNT60,11272
|
|
36
36
|
ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=oICRtl85n2puWvchcJIkmLZL1BAylMbzH7ltBGWfqgY,31973
|
|
37
37
|
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=s4E20EkvFZpsg2c2Gu-D6kHXS0QIkpx_chawHNSnlnU,9891
|
|
38
|
-
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=
|
|
38
|
+
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=lE3Vi9E9jk7Z9yYhSSgPgv6frzTDndwyUBeUOM5GHWI,27514
|
|
39
39
|
ScriptCollection/TFCPS/TFCPS_CreateRelease.py,sha256=X2NgZgbOkJsdZ6wMHB_RuS_rQCuz5oQCqzYrxyXBN9Q,6680
|
|
40
40
|
ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=5vCFfDiU8bvfcnoKNs2ATS8nsl6mYXcIuX7XfYE0tvg,2116
|
|
41
41
|
ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=BsSV4a-NZY86MZ20d-_rYxNVAI4UzAfmEwXlRZ8qWQc,7685
|
|
@@ -63,8 +63,8 @@ ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=Bd1gxCk9Fb
|
|
|
63
63
|
ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
64
64
|
ScriptCollection/TFCPS/Rust/TFCPS_CodeUnitSpecific_Rust.py,sha256=WhOsMpJxNGqnQGA3nJ99ruyqymxBeJxCcpK98zJduTo,1680
|
|
65
65
|
ScriptCollection/TFCPS/Rust/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
66
|
-
scriptcollection-4.3.
|
|
67
|
-
scriptcollection-4.3.
|
|
68
|
-
scriptcollection-4.3.
|
|
69
|
-
scriptcollection-4.3.
|
|
70
|
-
scriptcollection-4.3.
|
|
66
|
+
scriptcollection-4.3.11.dist-info/METADATA,sha256=WmVzalM7Slze1oMqrhFsBWgOm_GRL99DD9m8sg5gUqw,7816
|
|
67
|
+
scriptcollection-4.3.11.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
|
|
68
|
+
scriptcollection-4.3.11.dist-info/entry_points.txt,sha256=MwiP9P29EeSfjS19JOZmqbx8OzpZrUWpgMza3EffBs8,5812
|
|
69
|
+
scriptcollection-4.3.11.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
70
|
+
scriptcollection-4.3.11.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|