Sync eng/common directory with azure-sdk-tools repository for Tools P…

…R 1477
Azure · Mar 18, 2021 · c8ed829 · c8ed829
1 parent 0486526
commit c8ed829
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/eng/common/pipelines/templates/steps/docs-metadata-release.yml b/eng/common/pipelines/templates/steps/docs-metadata-release.yml
@@ -33,11 +33,14 @@ steps:
   displayName: Enable Long Paths if Necessary
 
 - pwsh: |
-    git clone https://$(azuresdk-github-pat)@github.com/${{ parameters.TargetDocRepoOwner }}/${{ parameters.TargetDocRepoName }} ${{ parameters.WorkingDirectory }}/repo
-
+    git clone https://github.com/${{ parameters.TargetDocRepoOwner }}/${{ parameters.TargetDocRepoName }} ${{ parameters.WorkingDirectory }}/repo
+ 
     try {
       Push-Location ${{ parameters.WorkingDirectory }}/repo
-
+      $setDefaultBranch = (git remote show origin | Out-String) -replace "(?ms).*HEAD branch: (\w+).*", '$1'
+      Write-Host "Setting DefaultBranch=$setDefaultBranch"
+      echo "##vso[task.setvariable variable=DefaultBranch]$setDefaultBranch"
+      
       Write-Host "git checkout ${{ parameters.SourceBranchName }}"
       git checkout ${{ parameters.SourceBranchName }}
     } finally {
@@ -46,10 +49,6 @@ steps:
   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:

diff --git a/eng/common/scripts/git-branch-push.ps1 b/eng/common/scripts/git-branch-push.ps1
@@ -177,5 +177,9 @@ do
 if ($LASTEXITCODE -ne 0 -or $tryNumber -ge $numberOfRetries)
 {
     Write-Error "Unable to push commit after $($tryNumber) retries LASTEXITCODE=$($LASTEXITCODE), see command output above."
+    if (0 -eq $LASTEXITCODE) 
+    {
+        exit 1
+    }
     exit $LASTEXITCODE
 }