From 2708ca8f11a2a52cab84a5a80828661142d1755c Mon Sep 17 00:00:00 2001 From: Danny Amirault Date: Wed, 25 Mar 2020 12:41:15 -0700 Subject: [PATCH] Specify artifact path in YML to locate artifact files correctly (#45) * Specify artifact path in YML to locate artifact files correctly * Remove doc generation for now --- .../templates/jobs/archetype-sdk-client.yml | 40 ------------------- sdk/core/ci.yml | 1 + 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 228284918..844c9290c 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -135,43 +135,3 @@ jobs: inputs: artifactName: packages path: $(Build.ArtifactStagingDirectory)/packages - - # Generate Documentation - - pwsh: | - $setupFile="doxygen-1.8.15-setup.exe"; - Invoke-WebRequest -MaximumRetryCount 10 -Uri "https://azuresdktooling.blob.core.windows.net/dependencies/doxygen-1.8.15-setup.exe" ` - -OutFile $setupFile | Wait-Process; Start-Process -Filepath .\$setupFile -ArgumentList @("/VERYSILENT") -Wait - workingDirectory: $(Agent.TempDirectory) - displayName: Download and Install Doxygen - - - ${{ each artifact in parameters.Artifacts }}: - - pwsh: Write-Host "##vso[task.setvariable variable=PackageVersion]$(Get-Content .\sdk\${{ parameters.ServiceDirectory }}\${{ artifact.Path }}\version.txt)" - displayName: Set $(PackageVersion) from version.txt file - ${{ artifact.Name }} - - pwsh: >- - python eng/docs/api/generate_docs.py - --TemplateFile="eng/docs/api/Doxyfile.template" - --PackagePath="sdk/${{ parameters.ServiceDirectory }}/${{ artifact.Path }}" - --PackageName="${{ artifact.Name }}" - --PackageVersion="$(PackageVersion)" - --AssetsPath="eng/docs/api/assets" - --DoxygenPath="c:\\program files\\doxygen\\bin\\doxygen.exe" - displayName: Generate docs - ${{ artifact.Name }} - - - pwsh: New-Item -ItemType directory -Path $(Build.ArtifactStagingDirectory) -Name docs/${{ artifact.Name }} - displayName: Create doc artifact location - ${{ artifact.Name }} - - - task: CopyFiles@2 - inputs: - sourceFolder: sdk/${{ parameters.ServiceDirectory }}/${{ artifact.Path }}/html - targetFolder: $(Build.ArtifactStagingDirectory)/docs/${{ artifact.Name }} - displayName: Copy documentation - ${{ artifact.Name }} - - - pwsh: | - $packageInfoPath = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/${{ artifact.Name }}/package-info.json - Copy-Item -Path $packageInfoPath -Destination $(Build.ArtifactStagingDirectory)/docs/${{ artifact.Name }}/package-info.json - displayName: Copy package-info.json to documentation path - - - task: PublishPipelineArtifact@1 - inputs: - artifactName: docs - path: $(Build.ArtifactStagingDirectory)/docs diff --git a/sdk/core/ci.yml b/sdk/core/ci.yml index b74f3468b..f821cb5b9 100644 --- a/sdk/core/ci.yml +++ b/sdk/core/ci.yml @@ -22,3 +22,4 @@ stages: ServiceDirectory: core Artifacts: - Name: azure-core + Path: azure-core