From a6bb11ed01d7e9a3ddf905b5edac7a3ae8551c40 Mon Sep 17 00:00:00 2001 From: Danny Amirault Date: Wed, 1 Apr 2020 09:01:40 -0700 Subject: [PATCH] Remove dependancy on azure-sdk-build-tools (#58) --- .../templates/stages/archetype-cpp-release.yml | 13 +++++-------- sdk/core/ci.yml | 3 --- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-cpp-release.yml b/eng/pipelines/templates/stages/archetype-cpp-release.yml index 77ba5b458..114204920 100644 --- a/eng/pipelines/templates/stages/archetype-cpp-release.yml +++ b/eng/pipelines/templates/stages/archetype-cpp-release.yml @@ -8,7 +8,7 @@ stages: - stage: Release_${{artifact.safeName}} displayName: 'Release ${{artifact.name}}' dependsOn: Build - condition: and(succeeded(), ne(variables['Build.Repository.Name'], 'Azure/azure-sdk-for-cpp-pr')) + condition: and(succeeded(), ne(variables['Build.Repository.Name'], 'Azure/azure-sdk-for-cpp')) jobs: - deployment: TagRepository @@ -24,11 +24,10 @@ stages: deploy: steps: - checkout: none - - template: tools/clone-buildtools/clone-buildtools.yml@azure-sdk-build-tools - pwsh: Get-ChildItem -Recurse $(Pipeline.Workspace)/packages/${{artifact.Name}} displayName: Output Visible Artifacts - pwsh: >- - $(Pipeline.Workspace)/azure-sdk-build-tools/scripts/create-tags-and-git-release.ps1 + $(Build.SourcesDirectory)/eng/common/create-tags-and-git-release.ps1 -artifactLocation "$(Pipeline.Workspace)/packages/${{artifact.Name}}" -packageRepository C -releaseSha $(Build.SourceVersion) @@ -53,18 +52,17 @@ stages: steps: - checkout: none - pwsh: Write-Host 'publish docs' - - template: tools/clone-buildtools/clone-buildtools.yml@azure-sdk-build-tools - pwsh: | Get-ChildItem -Recurse $(Pipeline.Workspace)/docs/${{ artifact.Name }} displayName: Output Visible Artifacts - - template: tools/generic-blob-upload/publish-blobs.yml@azure-sdk-build-tools + - template: ../../../common/pipelines/templates/steps/publish-blobs.yml parameters: FolderForUpload: '$(Pipeline.Workspace)/docs/${{ artifact.Name }}' BlobSASKey: '$(azure-sdk-docs-prod-sas)' BlobName: '$(azure-sdk-docs-prod-blob-name)' TargetLanguage: 'cpp' # we override the regular script path because we have cloned the build tools repo as a separate artifact. - ScriptPath: '$(Pipeline.Workspace)/azure-sdk-build-tools/scripts/copy-docs-to-blobstorage.ps1' + ScriptPath: '$(Build.SourcesDirectory)/eng/common/scripts/copy-docs-to-blobstorage.ps1' - ${{if ne(artifact.options.skipUpdatePackageVersion, 'true')}}: - deployment: UpdatePackageVersion @@ -83,8 +81,7 @@ stages: - pwsh: | eng/Update-PkgVersion.ps1 -ServiceDirectory '${{parameters.ServiceDirectory}}' -PackageName '${{artifact.name}}' displayName: Increment package version - - template: tools/clone-buildtools/clone-buildtools.yml@azure-sdk-build-tools - - template: pipelines/steps/create-pull-request.yml@azure-sdk-build-tools + - template: ../../../common/pipelines/templates/steps/create-pull-request.yml parameters: RepoName: azure-sdk-for-cpp PRBranchName: increment-package-version-${{ parameters.ServiceDirectory }}-$(Build.BuildId) diff --git a/sdk/core/ci.yml b/sdk/core/ci.yml index f821cb5b9..64ae024b4 100644 --- a/sdk/core/ci.yml +++ b/sdk/core/ci.yml @@ -4,9 +4,6 @@ resources: type: github name: Azure/azure-sdk-tools endpoint: azure - - repository: azure-sdk-build-tools - type: git - name: internal/azure-sdk-build-tools trigger: branches: