From 94ede06b62d00cd4a34be1e9f2e000173528910f Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Thu, 22 Jun 2023 16:07:13 -0700 Subject: [PATCH] Add branch merging support to our mirror pipeline This adds the ability to do a branch merge as part of our mirroring pipeline. The merge will allow configuration of which files to move from source to target so it can be scoped to part of the branch. Instead of a standard push it will create a PR with the merge so it can be manually reviewed. --- .../templates/steps/create-pull-request.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/common/pipelines/templates/steps/create-pull-request.yml b/eng/common/pipelines/templates/steps/create-pull-request.yml index df364d447862..57e413c2db78 100644 --- a/eng/common/pipelines/templates/steps/create-pull-request.yml +++ b/eng/common/pipelines/templates/steps/create-pull-request.yml @@ -13,9 +13,9 @@ parameters: PRTitle: not-specified PRBody: '' ScriptDirectory: eng/common/scripts - GHReviewersVariable: '' - GHTeamReviewersVariable: '' - GHAssignessVariable: '' + GHReviewers: '' + GHTeamReviewers: '' + GHAssignees: '' # Multiple labels seperated by comma, e.g. "bug, APIView" PRLabels: '' SkipCheckingForChanges: false @@ -52,8 +52,8 @@ steps: -PRTitle "${{ parameters.PRTitle }}" -PRBody "${{ coalesce(parameters.PRBody, parameters.CommitMsg, parameters.PRTitle) }}" -PRLabels "${{ parameters.PRLabels }}" - -UserReviewers "$(${{ parameters.GHReviewersVariable }})" - -TeamReviewers "$(${{ parameters.GHTeamReviewersVariable }})" - -Assignees "$(${{ parameters.GHAssignessVariable }})" + -UserReviewers "${{ parameters.GHReviewers }}" + -TeamReviewers "${{ parameters.GHTeamReviewers }}" + -Assignees "${{ parameters.GHAssignees }}" -CloseAfterOpenForTesting $${{ coalesce(parameters.CloseAfterOpenForTesting, 'false') }} -OpenAsDraft $${{ parameters.OpenAsDraft }}