Skip to content

Commit e97f67c

Browse files
authored
Fix the signing of the fleet installer exe (#7341)
## Summary of changes Ensure we sign Datadog.FleetInstaller.exe ## Reason for change We should be signing the exe, it's an oversight, because we're zipping up the directory _before_ signing. ## Implementation details Split the build and publish in two, so that we can sign the files inbetween - `BuildFleetInstaller` - `SignDlls` - `PublishFleetInstaller` ## Test coverage - [ ] I'll check the GitLab output to make sure it's now signed
1 parent da50409 commit e97f67c

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

tracer/build/_build/Build.Steps.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -882,9 +882,9 @@ async Task DownloadWafVersion(string libddwafVersion = null, string uncompressFo
882882
.DependsOn(PublishNativeTracerUnix)
883883
.DependsOn(PublishNativeTracerOsx);
884884

885-
Target PublishFleetInstaller => _ => _
885+
Target BuildFleetInstaller => _ => _
886886
.Unlisted()
887-
.Description("Builds and publishes the fleet installer binary files as a zip")
887+
.Description("Builds and publishes the fleet installer binary files")
888888
.After(Clean, Restore, CompileManagedSrc)
889889
.Before(SignDlls)
890890
.OnlyWhenStatic(() => IsWin)
@@ -905,7 +905,17 @@ async Task DownloadWafVersion(string libddwafVersion = null, string uncompressFo
905905
.SetConfiguration(BuildConfiguration)
906906
.SetOutput(publishFolder)
907907
.CombineWith(tfms, (p, tfm) => p.SetFramework(tfm)));
908+
});
908909

910+
Target PublishFleetInstaller => _ => _
911+
.Unlisted()
912+
.Description("Publishes the fleet installer binary files as a zip")
913+
.DependsOn(BuildFleetInstaller)
914+
.After(SignDlls)
915+
.OnlyWhenStatic(() => IsWin)
916+
.Executes(() =>
917+
{
918+
var publishFolder = ArtifactsDirectory / "Datadog.FleetInstaller";
909919
CompressZip(publishFolder, ArtifactsDirectory / "fleet-installer.zip", fileMode: FileMode.Create);
910920
});
911921

0 commit comments

Comments
 (0)