sartography/spiff-arena
1
0
Fork 0
mirror of https://github.com/sartography/spiff-arena.git synced 2025-01-26 09:20:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

added target branch to publish branch name to avoid conflicts between environments w/ burnettk

Browse Source
This commit is contained in:
jasquat 2023-12-11 15:32:07 -05:00
parent c36e342d1e
commit 9c38ca851b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spiffworkflow-backend/src/spiffworkflow_backend/services/git_service.py
View File

@ -266,7 +266,7 @@ class GitService:
cls.run_shell_command(cmd) cls.run_shell_command(cmd)
# create publish branch from branch_to_update # create publish branch from branch_to_update
cls.run_shell_command(["checkout", branch_to_update], context_directory=destination_process_root) cls.run_shell_command(["checkout", branch_to_update], context_directory=destination_process_root)
branch_to_pull_request = f"publish-{process_model_id}" branch_to_pull_request = f"publish-{process_model_id}-to-{branch_to_update}"
# check if branch exists and checkout appropriately # check if branch exists and checkout appropriately
command = [ command = [
@ -274,6 +274,8 @@ class GitService:
"--verify", "--verify",
f"refs/remotes/origin/{branch_to_pull_request}", f"refs/remotes/origin/{branch_to_pull_request}",
] ]
# to -b or not to -b
if cls.run_shell_command_as_boolean(command, context_directory=destination_process_root): if cls.run_shell_command_as_boolean(command, context_directory=destination_process_root):
cls.run_shell_command(["checkout", branch_to_pull_request], context_directory=destination_process_root) cls.run_shell_command(["checkout", branch_to_pull_request], context_directory=destination_process_root)
else: else: