generate linux specific native artifacts

GitTools · Apr 1, 2020 · 12278d0 · 12278d0
1 parent 64ea37a
commit 12278d0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/build/pack.cake b/build/pack.cake
@@ -154,8 +154,11 @@ void PackPrepareNative(ICakeContext context, BuildParameters parameters)
 
         context.Information("Validating native lib:");
 
-        var nativeExe = outputPath.CombineWithFilePath(IsRunningOnWindows() ? "gitversion.exe" : "gitversion");
-        ValidateOutput(nativeExe.FullPath, "/showvariable FullSemver", parameters.Version.GitVersion.FullSemVer);
+        // testing windows and macos artifacts, ther linux is tested with docker
+        if (platform != PlatformFamily.Linux)
+        {
+            var nativeExe = outputPath.CombineWithFilePath(IsRunningOnWindows() ? "gitversion.exe" : "gitversion");
+            ValidateOutput(nativeExe.FullPath, "/showvariable FullSemver", parameters.Version.GitVersion.FullSemVer);
+        }
     }
-
 }
diff --git a/build/utils/docker.cake b/build/utils/docker.cake
@@ -109,14 +109,16 @@ void DockerPullImage(DockerImage dockerImage, BuildParameters parameters)
 DockerContainerRunSettings GetDockerRunSettings(BuildParameters parameters)
 {
     var currentDir = MakeAbsolute(Directory("."));
+    var root = parameters.DockerRootPrefix;
     var settings = new DockerContainerRunSettings
     {
         Rm = true,
         Volume = new[]
         {
-            $"{currentDir}:{parameters.DockerRootPrefix}/repo",
-            $"{currentDir}/artifacts/v{parameters.Version.SemVersion}/nuget:{parameters.DockerRootPrefix}/nuget",
-            $"{currentDir}/test-scripts:{parameters.DockerRootPrefix}/scripts"
+            $"{currentDir}:{root}/repo",
+            $"{currentDir}/test-scripts:{root}/scripts",
+            $"{currentDir}/artifacts/v{parameters.Version.SemVersion}/nuget:{root}/nuget",
+            $"{currentDir}/artifacts/v{parameters.Version.SemVersion}/native/linux:{root}/native",
         }
     };
 

diff --git a/build/utils/parameters.cake b/build/utils/parameters.cake
@@ -141,7 +141,7 @@ public class BuildParameters
         NativeRuntimes = new Dictionary<PlatformFamily, string[]>
         {
             [PlatformFamily.Windows] = new[] { "win-x64", "win-x86" },
-            [PlatformFamily.Linux]   = new[] { "linux-x64" },
+            [PlatformFamily.Linux]   = new[] { "debian.9-x64", "centos.7-x64", "fedora.30-x64", "ubuntu.16.04-x64", "ubuntu.18.04-x64" },
             [PlatformFamily.OSX]     = new[] { "osx-x64" },
         };
 

diff --git a/test-scripts/Test-DotnetGlobalTool.ps1 b/test-scripts/Test-DotnetGlobalTool.ps1
@@ -4,10 +4,10 @@ param(
     [parameter(Mandatory=$true, Position=2)][string] $repoPath
 )
 
-$result = dotnet tool install GitVersion.Tool --version $version --tool-path $rootPrefix/tools --add-source $nugetPath | out-null;
+$result = dotnet tool install GitVersion.Tool --version $version --tool-path /tools --add-source $nugetPath | out-null;
 
 if($LASTEXITCODE -eq 0) {
-    & "$rootPrefix/tools/dotnet-gitversion" $repoPath /showvariable FullSemver;
+    & "/tools/dotnet-gitversion" $repoPath /showvariable FullSemver;
 } else {
     Write-Output $result
 }