diff --git a/src/api/app/models/workflow/step/branch_package_step.rb b/src/api/app/models/workflow/step/branch_package_step.rb index aa0b1567c0e..e0221a95dc7 100644 --- a/src/api/app/models/workflow/step/branch_package_step.rb +++ b/src/api/app/models/workflow/step/branch_package_step.rb @@ -14,11 +14,8 @@ def call restore_target_project elsif scm_webhook.new_commit_event? create_branched_package - unless scm_synced? - target_package.save_file({ file: branch_request_content, - filename: '_branch_request', - comment: BRANCH_REQUEST_COMMIT_MESSAGE }) - end + write_branch_request_file + write_scmsync_branch_information Workflows::ScmEventSubscriptionCreator.new(token, workflow_run, scm_webhook, target_package).call target_package @@ -27,6 +24,22 @@ def call private + def write_branch_request_file + return if scm_synced? + + target_package.save_file({ file: branch_request_content, + filename: '_branch_request', + comment: BRANCH_REQUEST_COMMIT_MESSAGE }) + end + + def write_scmsync_branch_information + return unless scm_synced? + # BranchPackage takes care of the initial setup of new packages + return if target_package.blank? + + target_package.update!(scmsync: parse_scmsync_for_target_package) + end + def target_project_base_name step_instructions[:target_project] end