From 5c5a19acd1a3ae90d278216db908da5c0241dde7 Mon Sep 17 00:00:00 2001 From: Ben Broderick Phillips Date: Thu, 1 Sep 2022 08:08:41 -0400 Subject: [PATCH] Use SkipCheckoutNone parameter name for sparse checkout --- eng/pipelines/docindex.yml | 10 +++++----- eng/pipelines/templates/jobs/ci.conda.tests.yml | 12 ++++++------ eng/pipelines/templates/steps/get-tagged-code.yml | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/pipelines/docindex.yml b/eng/pipelines/docindex.yml index 6f72d6b6be77..66b9112172a9 100644 --- a/eng/pipelines/docindex.yml +++ b/eng/pipelines/docindex.yml @@ -32,7 +32,7 @@ jobs: # Sync docs repo onboarding files/folders - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml parameters: - SkipDefaultCheckout: true + SkipCheckoutNone: true Paths: - ci-configs/ - metadata/ @@ -57,8 +57,8 @@ jobs: filePath: eng/common/scripts/Service-Level-Readme-Automation.ps1 arguments: >- -DocRepoLocation $(DocRepoLocation) - -TenantId '$(opensource-aad-tenant-id)' - -ClientId '$(opensource-aad-app-id)' + -TenantId '$(opensource-aad-tenant-id)' + -ClientId '$(opensource-aad-app-id)' -ClientSecret '$(opensource-aad-secret)' displayName: Generate Service Level Readme @@ -111,8 +111,8 @@ jobs: filePath: eng/common/scripts/Service-Level-Readme-Automation.ps1 arguments: >- -DocRepoLocation $(DocRepoLocation) - -TenantId '$(opensource-aad-tenant-id)' - -ClientId '$(opensource-aad-app-id)' + -TenantId '$(opensource-aad-tenant-id)' + -ClientId '$(opensource-aad-app-id)' -ClientSecret '$(opensource-aad-secret)' displayName: Generate Service Level Readme - task: Powershell@2 diff --git a/eng/pipelines/templates/jobs/ci.conda.tests.yml b/eng/pipelines/templates/jobs/ci.conda.tests.yml index 9cf4247475c8..88cbd790a091 100644 --- a/eng/pipelines/templates/jobs/ci.conda.tests.yml +++ b/eng/pipelines/templates/jobs/ci.conda.tests.yml @@ -85,25 +85,25 @@ jobs: versionSpec: $(PythonVersion) - pwsh: | - # due to faulty deployed scripts/how the path gets manipulated by conda actions on + # due to faulty deployed scripts/how the path gets manipulated by conda actions on # ubuntu and mac, we can't rely on bin/scripts being referenced correctly. see # https://github.com/MicrosoftDocs/azure-devops-docs/issues/3812 $activateMethod = "source $($env:CONDA)/bin/activate" # pypy3 is not a true python executable. in conda-land, we need to call it using pypy3, NOT python - # on windows, we need to add "--user" as otherwise pip won't successfully install/uninstall due to + # on windows, we need to add "--user" as otherwise pip won't successfully install/uninstall due to # how windows holds reservation on pip.exe. this is unnecessary on ubuntu/mac. $requirementSuffix = "" - # we always want to prepend the path with conda bin + # we always want to prepend the path with conda bin Write-Host "##vso[task.prependpath]]$($env:CONDA)/bin" if ($IsWindows) { # powershell does not have an equivalent of call/source, which is necessary when # using conda in azure devops. Note that we use `activate` natively here, as # a later path prepend of the /scripts directory actually works. - $activateMethod = "call activate" + $activateMethod = "call activate" $requirementSuffix = " --user" # on windows only, need to prepend with the scripts directory as well @@ -116,7 +116,7 @@ jobs: else { Write-Host "##vso[task.setvariable variable=PyVersion]python=$(PythonVersion)" } - + # we will use these variables extensively later Write-Host "##vso[task.setvariable variable=activate.method]$activateMethod" Write-Host "##vso[task.setvariable variable=requirement.suffix]$requirementSuffix" @@ -193,7 +193,7 @@ jobs: - Name: "Azure/azure-sdk-for-python" Commitish: "${{ checkout.Package }}_${{ checkout.Version }}" WorkingDirectory: "$(conda.build)" - SkipDefaultCheckout: true + SkipCheckoutNone: true - script: | echo "$(activate.method) ${{ artifact.name }}" diff --git a/eng/pipelines/templates/steps/get-tagged-code.yml b/eng/pipelines/templates/steps/get-tagged-code.yml index 34a0e0bf2033..7b470f44ef21 100644 --- a/eng/pipelines/templates/steps/get-tagged-code.yml +++ b/eng/pipelines/templates/steps/get-tagged-code.yml @@ -11,7 +11,7 @@ parameters: - name: Version type: string default: '' - + steps: - pwsh: | $targetPath = "$(Agent.TempDirectory)/${{ parameters.Package }}" @@ -28,11 +28,11 @@ steps: - Name: "Azure/azure-sdk-for-python" Commitish: "${{ parameters.Package }}_${{ parameters.Version }}" WorkingDirectory: "$(Package.Clone)" - SkipDefaultCheckout: true + SkipCheckoutNone: true - pwsh: | $pathForCopy = Join-Path -Path "$(Package.Clone)" -ChildPath "${{ parameters.CheckoutPath }}/${{ parameters.Package }}" - + Write-Host $pathForCopy Write-Host ${{ parameters.DestinationDirectory }}