Skip to content

Commit

Permalink
Build home directory artifact (DataDog#637)
Browse files Browse the repository at this point in the history
* Create home directory zip for release
  • Loading branch information
colin-higgins authored Feb 11, 2020
1 parent ac3e2d9 commit 49edc6d
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 1 deletion.
19 changes: 18 additions & 1 deletion .azure-pipelines/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

#### NuGet packages and Windows msi installer

- job: nuget_and_windows_msi
- job: nuget_and_windows_msi_and_home
strategy:
matrix:
x64:
Expand Down Expand Up @@ -85,13 +85,30 @@ jobs:
configuration: $(buildConfiguration)
msbuildArguments: /t:msi /p:RunWixToolsOutOfProc=true
maximumCpuCount: true

- task: MSBuild@1
displayName: msbuild tracer-home
condition: eq(variables['buildPlatform'], 'x64')
inputs:
solution: Datadog.Trace.proj
platform: $(buildPlatform)
configuration: $(buildConfiguration)
msbuildArguments: /t:CreateHomeDirectory
maximumCpuCount: true

- task: PublishPipelineArtifact@0
displayName: publish msi artifact
inputs:
artifactName: windows-msi-$(buildPlatform)
targetPath: deploy/Datadog.Trace.ClrProfiler.WindowsInstaller/bin/$(buildConfiguration)/$(buildPlatform)/en-us

- task: PublishPipelineArtifact@0
displayName: publish tracerhome artifact
condition: eq(variables['buildPlatform'], 'x64')
inputs:
artifactName: windows-tracer-home
targetPath: src/bin/windows-tracer-home.zip

#### Linux packages

- job: linux_packages
Expand Down
37 changes: 37 additions & 0 deletions Datadog.Trace.proj
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,41 @@
<Output TaskParameter="TargetOutputs" ItemName="CollectedBuildOutput"/>
</MSBuild>
</Target>

<Target Name="CreateHomeDirectory" DependsOnTargets="BuildCsharp;BuildCpp;PublishManagedProfilerOnDisk">
<ItemGroup>
<PublishedManagedTracerFiles Include="$(MSBuildThisFileDirectory)src\bin\managed-publish\**\*.*" />
</ItemGroup>
<PropertyGroup>
<WindowsHomeOutput>$(MSBuildThisFileDirectory)src\bin\windows-tracer-home</WindowsHomeOutput>
</PropertyGroup>
<Copy
SourceFiles="$(MSBuildThisFileDirectory)integrations.json"
DestinationFolder="$(WindowsHomeOutput)"
SkipUnchangedFiles="true"
Retries="3"
RetryDelayMilliseconds="300"/>
<Copy
SourceFiles="@(PublishedManagedTracerFiles)"
DestinationFiles="@(PublishedManagedTracerFiles->'$(WindowsHomeOutput)\%(RecursiveDir)%(Filename)%(Extension)')"
SkipUnchangedFiles="true"
Retries="3"
RetryDelayMilliseconds="300"/>
<Copy
SourceFiles="$(MSBuildThisFileDirectory)src\Datadog.Trace.ClrProfiler.Native\bin\Release\x64\Datadog.Trace.ClrProfiler.Native.dll"
DestinationFolder="$(WindowsHomeOutput)\x64"
SkipUnchangedFiles="true"
Retries="3"
RetryDelayMilliseconds="300"/>
<Copy
SourceFiles="$(MSBuildThisFileDirectory)src\Datadog.Trace.ClrProfiler.Native\bin\Release\x86\Datadog.Trace.ClrProfiler.Native.dll"
DestinationFolder="$(WindowsHomeOutput)\x86"
SkipUnchangedFiles="true"
Retries="3"
RetryDelayMilliseconds="300"/>
<Delete Files="$(WindowsHomeOutput).zip" />
<ZipDirectory
SourceDirectory="$(WindowsHomeOutput)"
DestinationFile="$(WindowsHomeOutput).zip" />
</Target>
</Project>
3 changes: 3 additions & 0 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ msbuild Datadog.Trace.proj /t:msi /p:Configuration=Release;Platform=x64
rem Build MSI installer for Windows x86 (supports x86 apps only)
msbuild Datadog.Trace.proj /t:msi /p:Configuration=Release;Platform=x86
rem Build tracer home directory for Windows (x64 and x86)
msbuild Datadog.Trace.proj /t:CreateHomeDirectory /p:Configuration=Release;Platform=x64
```

## Linux
Expand Down

0 comments on commit 49edc6d

Please sign in to comment.