From 5f7f272b3bd5c2b80b47194cf736bdf1fc98162d Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Fri, 26 Mar 2021 11:33:47 -0700 Subject: [PATCH 01/10] Checked in the changes directly. --- .../templates/steps/create-pull-request.yml | 54 ++++--------------- .../templates/steps/docs-metadata-release.yml | 41 ++++---------- .../templates/steps/git-push-changes.yml | 54 +++++++++++++++++++ eng/common/scripts/git-branch-push.ps1 | 52 ++++++++++-------- 4 files changed, 106 insertions(+), 95 deletions(-) create mode 100644 eng/common/pipelines/templates/steps/git-push-changes.yml diff --git a/eng/common/pipelines/templates/steps/create-pull-request.yml b/eng/common/pipelines/templates/steps/create-pull-request.yml index ecce673e31a4..940d4672c867 100644 --- a/eng/common/pipelines/templates/steps/create-pull-request.yml +++ b/eng/common/pipelines/templates/steps/create-pull-request.yml @@ -23,49 +23,17 @@ parameters: OpenAsDraft: false steps: - -- pwsh: | - echo "git add -A" - git add -A - - echo "git diff --name-status --cached --exit-code" - git diff --name-status --cached --exit-code - - if ($LastExitCode -ne 0) { - echo "##vso[task.setvariable variable=HasChanges]$true" - echo "Changes detected so setting HasChanges=true" - } - else { - echo "##vso[task.setvariable variable=HasChanges]$false" - echo "No changes so skipping code push" - } - displayName: Check for changes - condition: and(succeeded(), eq(${{ parameters.SkipCheckingForChanges }}, false)) - workingDirectory: ${{ parameters.WorkingDirectory }} - ignoreLASTEXITCODE: true - -- pwsh: | - # Remove the repo owner from the front of the repo name if it exists there - $repoName = "${{ parameters.RepoName }}" -replace "^${{ parameters.RepoOwner }}/", "" - echo "##vso[task.setvariable variable=RepoNameWithoutOwner]$repoName" - echo "RepoName = $repoName" - displayName: Remove Repo Owner from Repo Name - condition: succeeded() - workingDirectory: ${{ parameters.WorkingDirectory }} - -- task: PowerShell@2 - displayName: Push changes - condition: and(succeeded(), eq(variables['HasChanges'], 'true')) - inputs: - pwsh: true - workingDirectory: ${{ parameters.WorkingDirectory }} - filePath: ${{ parameters.ScriptDirectory }}/git-branch-push.ps1 - arguments: > - -PRBranchName "${{ parameters.PRBranchName }}" - -CommitMsg "${{ parameters.CommitMsg }}" - -GitUrl "https://$(azuresdk-github-pat)@github.com/${{ parameters.PROwner }}/$(RepoNameWithoutOwner).git" - -PushArgs "${{ parameters.PushArgs }}" - -SkipCommit $${{ parameters.SkipCheckingForChanges }} +- template: /eng/common/pipelines/templates/steps/git-push-changes.yml + parameters: + BaseRepoBranch: ${{ parameters.PRBranchName }} + BaseRepoOwner: ${{ parameters.PROwner }} + CommitMsg: ${{ parameters.CommitMsg }} + TargetRepoOwner: ${{ parameters.RepoOwner }} + TargetRepoName: ${{ parameters.RepoName }} + PushArgs: ${{ parameters.PushArgs }} + WorkingDirectory: ${{ parameters.WorkingDirectory }} + ScriptDirectory: ${{ parameters.ScriptDirectory }} + SkipCheckingForChanges: ${{ parameters.SkipCheckingForChanges }} - task: PowerShell@2 displayName: Create pull request diff --git a/eng/common/pipelines/templates/steps/docs-metadata-release.yml b/eng/common/pipelines/templates/steps/docs-metadata-release.yml index a01b197035db..ccdfa69548b7 100644 --- a/eng/common/pipelines/templates/steps/docs-metadata-release.yml +++ b/eng/common/pipelines/templates/steps/docs-metadata-release.yml @@ -9,7 +9,6 @@ parameters: TargetDocRepoName: '' TargetDocRepoOwner: '' PRBranchName: 'master-rdme' - SourceBranchName: 'master' PRLabels: 'auto-merge' ArtifactName: '' Language: '' @@ -34,18 +33,11 @@ steps: - pwsh: | git clone https://github.com/${{ parameters.TargetDocRepoOwner }}/${{ parameters.TargetDocRepoName }} ${{ parameters.WorkingDirectory }}/repo - - try { - Push-Location ${{ parameters.WorkingDirectory }}/repo - - Write-Host "git checkout ${{ parameters.SourceBranchName }}" - git checkout ${{ parameters.SourceBranchName }} - } finally { - Pop-Location - } displayName: Clone Documentation Repository ignoreLASTEXITCODE: false - +- template: /eng/common/pipelines/templates/steps/set-default-branch.yml + parameters: + WorkingDirectory: ${{ parameters.WorkingDirectory }}/repo - task: PowerShell@2 displayName: 'Apply Documentation Updates From Artifact' inputs: @@ -82,25 +74,19 @@ steps: env: GH_TOKEN: $(azuresdk-github-pat) -- template: /eng/common/pipelines/templates/steps/create-pull-request.yml +- template: /eng/common/pipelines/templates/steps/git-push-changes.yml parameters: + PRBranchName: $(DefaultBranch) + CommitMsg: "Update docs metadata and targeting for release of ${{ parameters.ArtifactName }}" RepoName: ${{ parameters.TargetDocRepoName }} RepoOwner: ${{ parameters.TargetDocRepoOwner }} - PRBranchName: ${{ parameters.PRBranchName }} - CommitMsg: "Update docs metadata and targeting for release of ${{ parameters.ArtifactName }}" - PRTitle: "Docs.MS Release Updates for ${{ parameters.ArtifactName }}" - BaseBranchName: ${{ parameters.SourceBranchName }} WorkingDirectory: ${{ parameters.WorkingDirectory }}/repo ScriptDirectory: ${{ parameters.WorkingDirectory }}/${{ parameters.ScriptDirectory }} - GHReviewersVariable: ${{ parameters.GHReviewersVariable }} - GHTeamReviewersVariable: ${{ parameters.GHTeamReviewersVariable }} - PRLabels: ${{ parameters.PRLabels }} - CloseAfterOpenForTesting: ${{ parameters.CloseAfterOpenForTesting }} + PROwner: ${{ parameters.TargetDocRepoOwner }} - ${{if ne( parameters['OnboardingBranch'], '')}}: - pwsh: | Push-Location ${{ parameters.WorkingDirectory }}/repo - git reset --hard HEAD git remote rm azure-sdk-fork git checkout ${{ parameters.OnboardingBranch}} @@ -123,17 +109,12 @@ steps: pwsh: true env: GH_TOKEN: $(azuresdk-github-pat) - - - template: /eng/common/pipelines/templates/steps/create-pull-request.yml + - template: /eng/common/pipelines/templates/steps/git-push-changes.yml parameters: + PRBranchName: ${{ parameters.OnboardingBranch}} + CommitMsg: "Update docs metadata and targeting for release of ${{ parameters.ArtifactName }}" RepoName: ${{ parameters.TargetDocRepoName }} RepoOwner: ${{ parameters.TargetDocRepoOwner }} - PRBranchName: ${{ parameters.PRBranchName }}-ci - CommitMsg: "CI Update for release of ${{ parameters.ArtifactName }}" - PRTitle: "Docs.MS CI Updates for ${{ parameters.ArtifactName }}" - BaseBranchName: ${{ parameters.OnboardingBranch }} WorkingDirectory: ${{ parameters.WorkingDirectory }}/repo ScriptDirectory: ${{ parameters.WorkingDirectory }}/${{ parameters.ScriptDirectory }} - GHReviewersVariable: ${{ parameters.GHReviewersVariable }} - GHTeamReviewersVariable: ${{ parameters.GHTeamReviewersVariable }} - CloseAfterOpenForTesting: ${{ parameters.CloseAfterOpenForTesting }} + PROwner: ${{ parameters.TargetDocRepoOwner }} diff --git a/eng/common/pipelines/templates/steps/git-push-changes.yml b/eng/common/pipelines/templates/steps/git-push-changes.yml new file mode 100644 index 000000000000..41f0fdb62255 --- /dev/null +++ b/eng/common/pipelines/templates/steps/git-push-changes.yml @@ -0,0 +1,54 @@ +parameters: + BaseRepoBranch: not-specified + BaseRepoOwner: azure-sdk + CommitMsg: not-specified + TargetRepoOwner: Azure + TargetRepoName: $(Build.Repository.Name) + PushArgs: + WorkingDirectory: $(System.DefaultWorkingDirectory)' + ScriptDirectory: eng/common/scripts + SkipCheckingForChanges: false + +steps: +- pwsh: | + echo "git add -A" + git add -A + + echo "git diff --name-status --cached --exit-code" + git diff --name-status --cached --exit-code + + if ($LastExitCode -ne 0) { + echo "##vso[task.setvariable variable=HasChanges]$true" + echo "Changes detected so setting HasChanges=true" + } + else { + echo "##vso[task.setvariable variable=HasChanges]$false" + echo "No changes so skipping code push" + } + displayName: Check for changes + condition: and(succeeded(), eq(${{ parameters.SkipCheckingForChanges }}, false)) + workingDirectory: ${{ parameters.WorkingDirectory }} + ignoreLASTEXITCODE: true + +- pwsh: | + # Remove the repo owner from the front of the repo name if it exists there + $repoName = "${{ parameters.RepoTargetRepoNameName }}" -replace "^${{ parameters.TargetRepoOwner }}/", "" + echo "##vso[task.setvariable variable=RepoNameWithoutOwner]$repoName" + echo "RepoName = $repoName" + displayName: Remove Repo Owner from Repo Name + condition: succeeded() + workingDirectory: ${{ parameters.WorkingDirectory }} + +- task: PowerShell@2 + displayName: Push changes + condition: and(succeeded(), eq(variables['HasChanges'], 'true')) + inputs: + pwsh: true + workingDirectory: ${{ parameters.WorkingDirectory }} + filePath: ${{ parameters.ScriptDirectory }}/git-branch-push.ps1 + arguments: > + -PRBranchName "${{ parameters.BaseRepoBranch }}" + -CommitMsg "${{ parameters.CommitMsg }}" + -GitUrl "https://$(azuresdk-github-pat)@github.com/${{ parameters.BaseRepoOwner }}/$(RepoNameWithoutOwner).git" + -PushArgs "${{ parameters.PushArgs }}" + -SkipCommit $${{ parameters.SkipCheckingForChanges }} diff --git a/eng/common/scripts/git-branch-push.ps1 b/eng/common/scripts/git-branch-push.ps1 index 72c0df0f6b63..4cf114ed727c 100644 --- a/eng/common/scripts/git-branch-push.ps1 +++ b/eng/common/scripts/git-branch-push.ps1 @@ -27,6 +27,7 @@ param( [Parameter(Mandatory = $false)] [string] $PushArgs = "", + [Parameter(Mandatory = $false)] [string] $RemoteName = "azure-sdk-fork", [Parameter(Mandatory = $false)] @@ -41,31 +42,34 @@ param( # would fail the first time git wrote command output. $ErrorActionPreference = "Continue" -if (!(git remote | ? {$_ -eq $RemoteName})) +if ((git remote) -contains $RemoteName) { - Write-Host "git remote add $RemoteName $GitUrl" - git remote add $RemoteName $GitUrl - if ($LASTEXITCODE -ne 0) - { - Write-Error "Unable to add remote LASTEXITCODE=$($LASTEXITCODE), see command output above." - exit $LASTEXITCODE - } + Write-Host "git remote get-url $RemoteName" + $remoteUrl = git remote get-url $RemoteName + if ($remoteUrl -ne $GitUrl) + { + Write-Error "Remote with name $RemoteName already exists with an incompatible url [$remoteUrl] which should be [$GitUrl]." + exit 1 + } } - -Write-Host "git fetch $RemoteName" -git fetch $RemoteName -if ($LASTEXITCODE -ne 0) +else { - Write-Error "Unable to fetch remote LASTEXITCODE=$($LASTEXITCODE), see command output above." + Write-Host "git remote add $RemoteName $GitUrl" + git remote add $RemoteName $GitUrl + if ($LASTEXITCODE -ne 0) + { + Write-Error "Unable to add remote LASTEXITCODE=$($LASTEXITCODE), see command output above." exit $LASTEXITCODE + } } - -Write-Host "git checkout -b $PRBranchName" -git checkout -b $PRBranchName -if ($LASTEXITCODE -ne 0) -{ - Write-Error "Unable to create branch LASTEXITCODE=$($LASTEXITCODE), see command output above." - exit $LASTEXITCODE +# Checkout to $PRBranch, create new one if not exists. +Write-Host "git checkout $PRBranchName." +git show-ref --verify --quiet refs/heads/$PRBranchName +if ($LASTEXITCODE -eq 0) { + git checkout $PRBranchName +} +else { + git checkout -b $PRBranchName } if (!$SkipCommit) { @@ -105,6 +109,7 @@ do { $needsRetry = $true Write-Host "Git push failed with LASTEXITCODE=$($LASTEXITCODE) Need to fetch and rebase: attempt number=$($tryNumber)" + Write-Host "git fetch $RemoteName" git fetch $RemoteName if ($LASTEXITCODE -ne 0) @@ -123,7 +128,6 @@ do Write-Error "Unable to create diff file LASTEXITCODE=$($LASTEXITCODE), see command output above." continue } - Write-Host "git reset --hard $RemoteName/${PRBranchName}" git reset --hard $RemoteName/${PRBranchName} if ($LASTEXITCODE -ne 0) @@ -168,8 +172,12 @@ do } } while($needsRetry -and $tryNumber -le $numberOfRetries) -if ($LASTEXITCODE -ne 0) +if ($LASTEXITCODE -ne 0 -or $tryNumber -gt $numberOfRetries) { Write-Error "Unable to push commit after $($tryNumber) retries LASTEXITCODE=$($LASTEXITCODE), see command output above." + if (0 -eq $LASTEXITCODE) + { + exit 1 + } exit $LASTEXITCODE } From 03d17b1fddf7ef6f5bd514b32f60d930073446e7 Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Fri, 26 Mar 2021 11:48:37 -0700 Subject: [PATCH 02/10] Address feedback and remove the check of set-default-branch --- eng/common/pipelines/templates/steps/set-default-branch.yml | 1 - eng/common/scripts/git-branch-push.ps1 | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/common/pipelines/templates/steps/set-default-branch.yml b/eng/common/pipelines/templates/steps/set-default-branch.yml index b4949e93bbfa..b66478975a6c 100644 --- a/eng/common/pipelines/templates/steps/set-default-branch.yml +++ b/eng/common/pipelines/templates/steps/set-default-branch.yml @@ -8,4 +8,3 @@ steps: echo "##vso[task.setvariable variable=DefaultBranch]$setDefaultBranch" displayName: "Setup Default Branch" workingDirectory: ${{ parameters.workingDirectory }} - condition: eq(variables['DefaultBranch'], '') diff --git a/eng/common/scripts/git-branch-push.ps1 b/eng/common/scripts/git-branch-push.ps1 index 4cf114ed727c..9d007f123fe5 100644 --- a/eng/common/scripts/git-branch-push.ps1 +++ b/eng/common/scripts/git-branch-push.ps1 @@ -71,7 +71,11 @@ if ($LASTEXITCODE -eq 0) { else { git checkout -b $PRBranchName } - +if ($LASTEXITCODE -ne 0) +{ + Write-Error "Unable to create branch LASTEXITCODE=$($LASTEXITCODE), see command output above." + exit $LASTEXITCODE +} if (!$SkipCommit) { if ($AmendCommit) { $amendOption = "--amend" From 90c3857ba58cbd7a1df2f8ebd22722b2c59b50ee Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Fri, 26 Mar 2021 12:47:08 -0700 Subject: [PATCH 03/10] Fixed base repo branch --- .../pipelines/templates/steps/docs-metadata-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/pipelines/templates/steps/docs-metadata-release.yml b/eng/common/pipelines/templates/steps/docs-metadata-release.yml index ccdfa69548b7..4d9e92f87f0b 100644 --- a/eng/common/pipelines/templates/steps/docs-metadata-release.yml +++ b/eng/common/pipelines/templates/steps/docs-metadata-release.yml @@ -76,7 +76,7 @@ steps: - template: /eng/common/pipelines/templates/steps/git-push-changes.yml parameters: - PRBranchName: $(DefaultBranch) + BaseRepoBranch: $(DefaultBranch) CommitMsg: "Update docs metadata and targeting for release of ${{ parameters.ArtifactName }}" RepoName: ${{ parameters.TargetDocRepoName }} RepoOwner: ${{ parameters.TargetDocRepoOwner }} @@ -111,7 +111,7 @@ steps: GH_TOKEN: $(azuresdk-github-pat) - template: /eng/common/pipelines/templates/steps/git-push-changes.yml parameters: - PRBranchName: ${{ parameters.OnboardingBranch}} + BaseRepoBranch: ${{ parameters.OnboardingBranch}} CommitMsg: "Update docs metadata and targeting for release of ${{ parameters.ArtifactName }}" RepoName: ${{ parameters.TargetDocRepoName }} RepoOwner: ${{ parameters.TargetDocRepoOwner }} From d7eb40190856bab386b48affb58d7bf79ef2c3a5 Mon Sep 17 00:00:00 2001 From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com> Date: Fri, 26 Mar 2021 13:29:58 -0700 Subject: [PATCH 04/10] Update git-branch-push.ps1 --- eng/common/scripts/git-branch-push.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/scripts/git-branch-push.ps1 b/eng/common/scripts/git-branch-push.ps1 index 9d007f123fe5..aae43b7a17b9 100644 --- a/eng/common/scripts/git-branch-push.ps1 +++ b/eng/common/scripts/git-branch-push.ps1 @@ -63,9 +63,9 @@ else } } # Checkout to $PRBranch, create new one if not exists. -Write-Host "git checkout $PRBranchName." git show-ref --verify --quiet refs/heads/$PRBranchName if ($LASTEXITCODE -eq 0) { + Write-Host "git checkout $PRBranchName." git checkout $PRBranchName } else { From 414d5761221cd75574d8654417e190dac251d15f Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Fri, 26 Mar 2021 13:52:18 -0700 Subject: [PATCH 05/10] Fixed the docs-metadata-release --- .../templates/steps/docs-metadata-release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/common/pipelines/templates/steps/docs-metadata-release.yml b/eng/common/pipelines/templates/steps/docs-metadata-release.yml index 4d9e92f87f0b..fc52ac8db067 100644 --- a/eng/common/pipelines/templates/steps/docs-metadata-release.yml +++ b/eng/common/pipelines/templates/steps/docs-metadata-release.yml @@ -77,12 +77,12 @@ steps: - template: /eng/common/pipelines/templates/steps/git-push-changes.yml parameters: BaseRepoBranch: $(DefaultBranch) + BaseRepoOwner: ${{ parameters.TargetDocRepoOwner }}: ${{ parameters.TargetDocRepoOwner }} CommitMsg: "Update docs metadata and targeting for release of ${{ parameters.ArtifactName }}" - RepoName: ${{ parameters.TargetDocRepoName }} - RepoOwner: ${{ parameters.TargetDocRepoOwner }} + TargetRepoName: ${{ parameters.TargetDocRepoName }} + TargetRepoOwner: ${{ parameters.TargetDocRepoOwner }} WorkingDirectory: ${{ parameters.WorkingDirectory }}/repo ScriptDirectory: ${{ parameters.WorkingDirectory }}/${{ parameters.ScriptDirectory }} - PROwner: ${{ parameters.TargetDocRepoOwner }} - ${{if ne( parameters['OnboardingBranch'], '')}}: - pwsh: | @@ -112,9 +112,9 @@ steps: - template: /eng/common/pipelines/templates/steps/git-push-changes.yml parameters: BaseRepoBranch: ${{ parameters.OnboardingBranch}} + BaseRepoOwner: ${{ parameters.TargetDocRepoOwner }} CommitMsg: "Update docs metadata and targeting for release of ${{ parameters.ArtifactName }}" - RepoName: ${{ parameters.TargetDocRepoName }} - RepoOwner: ${{ parameters.TargetDocRepoOwner }} + TargetRepoName: ${{ parameters.TargetDocRepoName }} + TargetRepoOwner: ${{ parameters.TargetDocRepoOwner }} WorkingDirectory: ${{ parameters.WorkingDirectory }}/repo ScriptDirectory: ${{ parameters.WorkingDirectory }}/${{ parameters.ScriptDirectory }} - PROwner: ${{ parameters.TargetDocRepoOwner }} From c74ae161dd285dd68f923482a560c8e3ed27ae09 Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Fri, 26 Mar 2021 14:07:44 -0700 Subject: [PATCH 06/10] Change the typo --- eng/common/pipelines/templates/steps/docs-metadata-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/steps/docs-metadata-release.yml b/eng/common/pipelines/templates/steps/docs-metadata-release.yml index fc52ac8db067..9756ad30a151 100644 --- a/eng/common/pipelines/templates/steps/docs-metadata-release.yml +++ b/eng/common/pipelines/templates/steps/docs-metadata-release.yml @@ -77,7 +77,7 @@ steps: - template: /eng/common/pipelines/templates/steps/git-push-changes.yml parameters: BaseRepoBranch: $(DefaultBranch) - BaseRepoOwner: ${{ parameters.TargetDocRepoOwner }}: ${{ parameters.TargetDocRepoOwner }} + BaseRepoOwner: ${{ parameters.TargetDocRepoOwner }} CommitMsg: "Update docs metadata and targeting for release of ${{ parameters.ArtifactName }}" TargetRepoName: ${{ parameters.TargetDocRepoName }} TargetRepoOwner: ${{ parameters.TargetDocRepoOwner }} From a1a6f1a1dfd68b33efe8c4a3518b628650603e31 Mon Sep 17 00:00:00 2001 From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com> Date: Fri, 26 Mar 2021 14:18:56 -0700 Subject: [PATCH 07/10] Update eng/common/scripts/git-branch-push.ps1 Co-authored-by: Wes Haggard --- eng/common/scripts/git-branch-push.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/common/scripts/git-branch-push.ps1 b/eng/common/scripts/git-branch-push.ps1 index aae43b7a17b9..bbd6a13edb04 100644 --- a/eng/common/scripts/git-branch-push.ps1 +++ b/eng/common/scripts/git-branch-push.ps1 @@ -69,6 +69,7 @@ if ($LASTEXITCODE -eq 0) { git checkout $PRBranchName } else { + Write-Host "git checkout -b $PRBranchName." git checkout -b $PRBranchName } if ($LASTEXITCODE -ne 0) From 1b82962a835dad00cefe9a208178814f77c063e2 Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Fri, 26 Mar 2021 14:21:39 -0700 Subject: [PATCH 08/10] Keep origin format --- eng/common/scripts/git-branch-push.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/common/scripts/git-branch-push.ps1 b/eng/common/scripts/git-branch-push.ps1 index bbd6a13edb04..7de9b66c208e 100644 --- a/eng/common/scripts/git-branch-push.ps1 +++ b/eng/common/scripts/git-branch-push.ps1 @@ -77,6 +77,7 @@ if ($LASTEXITCODE -ne 0) Write-Error "Unable to create branch LASTEXITCODE=$($LASTEXITCODE), see command output above." exit $LASTEXITCODE } + if (!$SkipCommit) { if ($AmendCommit) { $amendOption = "--amend" @@ -133,6 +134,7 @@ do Write-Error "Unable to create diff file LASTEXITCODE=$($LASTEXITCODE), see command output above." continue } + Write-Host "git reset --hard $RemoteName/${PRBranchName}" git reset --hard $RemoteName/${PRBranchName} if ($LASTEXITCODE -ne 0) From 31e7cf421ad78b4ac3ae6ee9ba9d45727f68db7f Mon Sep 17 00:00:00 2001 From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com> Date: Fri, 26 Mar 2021 14:28:16 -0700 Subject: [PATCH 09/10] Update git-branch-push.ps1 --- eng/common/scripts/git-branch-push.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/scripts/git-branch-push.ps1 b/eng/common/scripts/git-branch-push.ps1 index 7de9b66c208e..e99a8edbd59f 100644 --- a/eng/common/scripts/git-branch-push.ps1 +++ b/eng/common/scripts/git-branch-push.ps1 @@ -134,7 +134,7 @@ do Write-Error "Unable to create diff file LASTEXITCODE=$($LASTEXITCODE), see command output above." continue } - + Write-Host "git reset --hard $RemoteName/${PRBranchName}" git reset --hard $RemoteName/${PRBranchName} if ($LASTEXITCODE -ne 0) From cfe1caa58dbdacc7b3441098a237efb276e2de49 Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Fri, 26 Mar 2021 15:50:04 -0700 Subject: [PATCH 10/10] Keep fixing the typo --- eng/common/pipelines/templates/steps/git-push-changes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/steps/git-push-changes.yml b/eng/common/pipelines/templates/steps/git-push-changes.yml index 41f0fdb62255..a922b203a9b1 100644 --- a/eng/common/pipelines/templates/steps/git-push-changes.yml +++ b/eng/common/pipelines/templates/steps/git-push-changes.yml @@ -32,7 +32,7 @@ steps: - pwsh: | # Remove the repo owner from the front of the repo name if it exists there - $repoName = "${{ parameters.RepoTargetRepoNameName }}" -replace "^${{ parameters.TargetRepoOwner }}/", "" + $repoName = "${{ parameters.TargetRepoName }}" -replace "^${{ parameters.TargetRepoOwner }}/", "" echo "##vso[task.setvariable variable=RepoNameWithoutOwner]$repoName" echo "RepoName = $repoName" displayName: Remove Repo Owner from Repo Name