Problem ref head (#15)

This commit is contained in:
2025-09-23 22:01:38 +02:00
committed by GitHub
parent 333a5e9a7a
commit 1ba571b702
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -175,7 +175,7 @@ if __name__ == '__main__':
if not isinstance(step, GitClone):
continue
branches[env.id] = {**step.get_branches()}
# print(f"Delete check {env.branches} after {[x for x in env.branches if x[0] in branches[env.id].keys()]}")
# logger.info(f"Delete check {env.branches} after {[x for x in env.branches if x[0] in branches[env.id].keys()]}")
env.branches = [x for x in env.branches if x[0] in branches[env.id].keys()]
except BaseException as e:
socketio.emit('error', {'message': e}, namespace='/ws/errors')
+2 -1
View File
@@ -173,7 +173,7 @@ class DockerSwarmDeploy(AbstractStep[str]):
a[k] = v
del env["version"]
merge_dicts(compose, env)
# print(f"Final compose: {compose}")
# logger.info(f"Final compose: {compose}")
content = yaml.safe_dump(compose)
current_services = self.stackChecker.result
@@ -213,6 +213,7 @@ class DockerSwarmDeploy(AbstractStep[str]):
# Deploy stack to Docker Swarm
cmd = [
"docker", "stack", "deploy",
"--prune",
"-c", tmp_compose_path,
self.stack_name
]
+1 -2
View File
@@ -188,7 +188,6 @@ class CheckoutMerged(AbstractStep[CheckoutAndMergeResult]):
return CheckoutAndMergeResult(auto_branch_name, auto_branch_hash, version)
repo.git.checkout(repo.head.commit.hexsha)
if auto_branch_name in repo.branches:
repo.git.branch('-D', auto_branch_name)
# Auto branch doesn't exist, create it
@@ -196,7 +195,7 @@ class CheckoutMerged(AbstractStep[CheckoutAndMergeResult]):
commits = list(commit_ids.keys())
repo.git.branch('-f', auto_branch_name, commits[0].hexsha)
repo.git.checkout(auto_branch_name)
repo.git.checkout(commits[0].hexsha)
# Merge the rest of the branches
for commit in commits[1:]: