(build) test the native binaries

Author: arturcic

build/pack.cake

@@ -2,29 +2,7 @@ Task("Pack-Prepare")
     .IsDependentOn("Validate-Version")
     .Does<BuildParameters>((parameters) =>
 {
-    // publish single file for all native runtimes (self contained)
-    foreach(var runtime in parameters.NativeRuntimes)
-    {
-        var runtimeName = runtime.Value;
-
-        var settings = new DotNetCorePublishSettings
-        {
-            Framework = parameters.CoreFxVersion31,
-            Runtime = runtimeName,
-            NoRestore = false,
-            Configuration = parameters.Configuration,
-            OutputDirectory = parameters.Paths.Directories.Native.Combine(runtimeName),
-            MSBuildSettings = parameters.MSBuildSettings,
-        };
-
-        settings.ArgumentCustomization =
-            arg => arg
-            .Append("/p:PublishSingleFile=true")
-            .Append("/p:PublishTrimmed=true")
-            .Append("/p:IncludeSymbolsInSingleFile=true");
-
-        DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", settings);
-    }
+    PackPrepareNative(Context, parameters);
 
     var frameworks = new[] { parameters.CoreFxVersion21, parameters.FullFxVersion472 };
 
@@ -132,11 +110,46 @@ Task("Zip-Files")
     .IsDependentOn("Pack-Prepare")
     .Does<BuildParameters>((parameters) =>
 {
-    foreach(var runtime in parameters.NativeRuntimes)
-    {
-        var sourceDir = parameters.Paths.Directories.Native.Combine(runtime.Value);
-        var fileName = $"gitversion-{runtime.Key}-{parameters.Version.SemVersion}.tar.gz".ToLower();
-        var tarFile = parameters.Paths.Directories.Artifacts.CombineWithFilePath(fileName);
-        GZipCompress(sourceDir, tarFile);
-    }
+    var platform = Context.Environment.Platform.Family.ToString().ToLower();
+
+    var sourceDir = parameters.Paths.Directories.Native.Combine(platform);
+    var targetDir = parameters.Paths.Directories.ArtifactsRoot.Combine("native");
+    EnsureDirectoryExists(targetDir);
+    var fileName = $"gitversion-{platform}-{parameters.Version.SemVersion}.tar.gz".ToLower();
+    var tarFile = targetDir.CombineWithFilePath(fileName);
+    GZipCompress(sourceDir, tarFile);
 });
+
+void PackPrepareNative(ICakeContext context, BuildParameters parameters)
+{
+    // publish single file for all native runtimes (self contained)
+    var platform = Context.Environment.Platform.Family;
+    var runtime = parameters.NativeRuntimes[platform];
+    var outputPath = parameters.Paths.Directories.Native.Combine(platform.ToString().ToLower());
+
+    var settings = new DotNetCorePublishSettings
+    {
+        Framework = parameters.CoreFxVersion31,
+        Runtime = runtime,
+        NoRestore = false,
+        Configuration = parameters.Configuration,
+        OutputDirectory = outputPath,
+        MSBuildSettings = parameters.MSBuildSettings,
+    };
+
+    settings.ArgumentCustomization =
+        arg => arg
+        .Append("/p:PublishSingleFile=true")
+        .Append("/p:PublishTrimmed=true")
+        .Append("/p:IncludeSymbolsInSingleFile=true");
+
+    context.DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", settings);
+
+    context.Information("Validating native lib:");
+
+    var nativeExe = outputPath.CombineWithFilePath(IsRunningOnWindows() ? "gitversion.exe" : "gitversion");
+    var output = context.ExecuteCommand(nativeExe, "/showvariable FullSemver");
+    var outputStr = string.Concat(output);
+
+    Assert.Equal(parameters.Version.GitVersion.FullSemVer, outputStr);
+}

build/release.cake

@@ -18,7 +18,7 @@ Task("Release-Notes")
         TargetCommitish   = "master"
     });
 
-    var zipFiles = GetFiles(parameters.Paths.Directories.Artifacts + "/*.tar.gz").Select(x => x.ToString());
+    var zipFiles = GetFiles(parameters.Paths.Directories.ArtifactsRoot + "/*.tar.gz").Select(x => x.ToString());
     var assets = string.Join(",", zipFiles);
     GitReleaseManagerAddAssets(token, repoOwner, repository, parameters.Version.Milestone, assets);
     GitReleaseManagerClose(token, repoOwner, repository, parameters.Version.Milestone);

build/utils/paths.cake

@@ -27,7 +27,8 @@ public class BuildPaths
 
         var rootDir                       = (DirectoryPath)(context.Directory("."));
         var sourceDir                     = rootDir.Combine("src");
-        var artifactsDir                  = rootDir.Combine("artifacts").Combine("v" + semVersion);
+        var artifactsRootDir              = rootDir.Combine("artifacts");
+        var artifactsDir                  = artifactsRootDir.Combine("v" + semVersion);
         var artifactsBinDir               = artifactsDir.Combine("bin");
         var artifactsBinPortableDir       = artifactsBinDir.Combine("portable");
         var artifactsBinCmdlineDir        = artifactsBinDir.Combine("cmdline");
@@ -46,6 +47,7 @@ public class BuildPaths
         var buildDirectories = new BuildDirectories(
             rootDir,
             sourceDir,
+            artifactsRootDir,
             artifactsDir,
             nativeDir,
             buildArtifactDir,
@@ -92,6 +94,7 @@ public class BuildDirectories
 {
     public DirectoryPath Root { get; private set; }
     public DirectoryPath Source { get; private set; }
+    public DirectoryPath ArtifactsRoot { get; private set; }
     public DirectoryPath Artifacts { get; private set; }
     public DirectoryPath Native { get; private set; }
     public DirectoryPath NugetRoot { get; private set; }
@@ -108,6 +111,7 @@ public class BuildDirectories
     public BuildDirectories(
         DirectoryPath rootDir,
         DirectoryPath sourceDir,
+        DirectoryPath artifactsRootDir,
         DirectoryPath artifactsDir,
         DirectoryPath nativeDir,
         DirectoryPath buildArtifactDir,
@@ -123,6 +127,7 @@ public class BuildDirectories
     {
         Root = rootDir;
         Source = sourceDir;
+        ArtifactsRoot = artifactsRootDir;
         Artifacts = artifactsDir;
         Native = nativeDir;
         BuildArtifact = buildArtifactDir;