diff --git a/eng/common/pipelines/templates/steps/docs-metadata-release.yml b/eng/common/pipelines/templates/steps/docs-metadata-release.yml index 2f58b90d4d..7b6fb183a5 100644 --- a/eng/common/pipelines/templates/steps/docs-metadata-release.yml +++ b/eng/common/pipelines/templates/steps/docs-metadata-release.yml @@ -81,7 +81,7 @@ steps: - ${{ if parameters.SparseCheckoutPaths }}: - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml parameters: - SkipDefaultCheckout: true + SkipCheckoutNone: true Repositories: - Name: ${{ parameters.TargetDocRepoOwner }}/${{ parameters.TargetDocRepoName }} WorkingDirectory: ${{ parameters.WorkingDirectory }}/repo diff --git a/eng/common/pipelines/templates/steps/sparse-checkout.yml b/eng/common/pipelines/templates/steps/sparse-checkout.yml index 0a2b537be1..39d5a7bff1 100644 --- a/eng/common/pipelines/templates/steps/sparse-checkout.yml +++ b/eng/common/pipelines/templates/steps/sparse-checkout.yml @@ -8,13 +8,17 @@ parameters: - Name: $(Build.Repository.Name) Commitish: $(Build.SourceVersion) WorkingDirectory: $(System.DefaultWorkingDirectory) + # NOTE: SkipDefaultCheckout is being deprecated in favor of SkipCheckoutNone - name: SkipDefaultCheckout type: boolean default: false + - name: SkipCheckoutNone + type: boolean + default: false steps: - - ${{ if not(parameters.SkipDefaultCheckout) }}: - - checkout: none + - ${{ if and(not(parameters.SkipDefaultCheckout), not(parameters.SkipCheckoutNone)) }}: + - checkout: none - task: PowerShell@2 displayName: 'Sparse checkout repositories' diff --git a/eng/common/pipelines/templates/steps/update-docsms-metadata.yml b/eng/common/pipelines/templates/steps/update-docsms-metadata.yml index 66d8335de8..c34cd30802 100644 --- a/eng/common/pipelines/templates/steps/update-docsms-metadata.yml +++ b/eng/common/pipelines/templates/steps/update-docsms-metadata.yml @@ -47,7 +47,7 @@ steps: - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml parameters: - SkipDefaultCheckout: true + SkipCheckoutNone: true Repositories: - Name: ${{ parameters.TargetDocRepoOwner }}/${{ parameters.TargetDocRepoName }} WorkingDirectory: $(DocRepoLocation) @@ -77,7 +77,7 @@ steps: displayName: Checkout daily docs branch if it exists workingDirectory: $(DocRepoLocation) - # If NOT performing a daily docs build, set the $(TargetBranchName) to the + # If NOT performing a daily docs build, set the $(TargetBranchName) to the # default branch of the documentation repository. - ${{ if ne(parameters.DailyDocsBuild, 'true') }}: - template: /eng/common/pipelines/templates/steps/set-default-branch.yml @@ -104,7 +104,7 @@ steps: -PackageSourceOverride '${{ parameters.PackageSourceOverride }}' ` -TenantId '$(opensource-aad-tenant-id)' ` -ClientId '$(opensource-aad-app-id)' ` - -ClientSecret '$(opensource-aad-secret)' + -ClientSecret '$(opensource-aad-secret)' displayName: Apply Documentation Updates - template: /eng/common/pipelines/templates/steps/git-push-changes.yml