diff --git a/eng/pipelines/docindex.yml b/eng/pipelines/docindex.yml index ca5bf71c92a9..91c2ac7c1430 100644 --- a/eng/pipelines/docindex.yml +++ b/eng/pipelines/docindex.yml @@ -8,9 +8,9 @@ jobs: vmImage: ubuntu-20.04 variables: DocRepoLocation: $(Pipeline.Workspace)/docs + DailyDocRepoLocation: $(Pipeline.Workspace)/daily DocRepoOwner: Azure DocRepoName: azure-docs-sdk-java - DailyDocsRepoOwner: azure-sdk steps: # Sync docs repo onboarding files/folders - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml @@ -50,29 +50,16 @@ jobs: - template: /eng/common/pipelines/templates/steps/set-daily-docs-branch-name.yml parameters: DailyBranchVariableName: DailyDocsBranchName - # Create a branch to track docs fork repo onboarding files/folders - - pwsh: | - $ErrorActionPreference = "Continue" - # git remote on fork repo - $GitUrl = "https://$(azuresdk-github-pat)@github.com/$(DailyDocsRepoOwner)/$(DocRepoName).git" - $remoteName = "$(DailyDocsRepoOwner)" - 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 - } - - # git fetch on fork repo - Write-Host "git fetch $remoteName $(DailyDocsBranchName)" - git fetch $remoteName "$(DailyDocsBranchName)" - - # create a branch tracking fork repo daily branch - Write-Host "git checkout -b $(DailyDocsBranchName) -t $remoteName/$(DailyDocsBranchName)" - git checkout -b $(DailyDocsBranchName) -t "$remoteName/$(DailyDocsBranchName)" - displayName: Checkout fork repo daily branch - workingDirectory: $(DocRepoLocation) + - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml + parameters: + SkipDefaultCheckout: true + Paths: + - package.json + - metadata/ + Repositories: + - Name: azure-sdk/$(DocRepoName) + WorkingDirectory: $(DailyDocRepoLocation) + # Docs daily updates is supposed to download packages from public feed repository, so we have to specify additional repositories in a POM or the profile. # Here is maven documentation: https://maven.apache.org/guides/mini/guide-multiple-repositories.html - powershell: | @@ -87,12 +74,11 @@ jobs: Copy-Item "./eng/repo-docs/docms/daily.update.setting.xml" -Destination "~/.m2/settings.xml" displayName: 'Configure mvn' workingDirectory: $(Build.SourcesDirectory) - - task: Powershell@2 inputs: pwsh: true filePath: eng/common/scripts/Update-DocsMsPackages.ps1 - arguments: -DocRepoLocation "$(DocRepoLocation)" + arguments: -DocRepoLocation $(DailyDocRepoLocation) displayName: Update Docs Onboarding for Daily branch - template: /eng/common/pipelines/templates/steps/git-push-changes.yml parameters: @@ -101,7 +87,7 @@ jobs: CommitMsg: "Update targeting packages based on release metadata. (Daily docs)" TargetRepoName: $(DocRepoName) TargetRepoOwner: $(DocRepoOwner) - WorkingDirectory: $(DocRepoLocation) + WorkingDirectory: $(DailyDocRepoLocation) ScriptDirectory: $(Build.SourcesDirectory)/eng/common/scripts - task: PowerShell@2 @@ -114,4 +100,4 @@ jobs: -Project "Content%20CI" -DefinitionId 3188 -Base64EncodedAuthToken "$(azuresdk-apidrop-devops-queue-build-pat)" - -BuildParametersJson (@{ params = (Get-Content ./eng/dailydocsconfig.json -Raw) -replace '%%DailyDocsBranchName%%', "$(DailyDocsBranchName)" } | ConvertTo-Json) + -BuildParametersJson (@{ params = (Get-Content ./eng/dailydocsconfig.json -Raw) -replace '%%DailyDocsBranchName%%', "$(DailyDocsBranchName)" } | ConvertTo-Json) \ No newline at end of file