(build) cleanup

Author: arturcic

.github/workflows/ci.yml

@@ -137,14 +137,13 @@ jobs:
       shell: pwsh
       run: dotnet run/build.dll --target=Test --dotnet_target=${{ matrix.targetFramework }}
 
-  artifacts_linux_test:
-    name: Test artifacts in docker
+  artifacts_windows_test:
+    name: Test artifacts on windows
     needs: [build]
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     strategy:
       matrix:
-        targetFramework: [ '3.1', '5.0' ]
-        distro: [ alpine.3.12-x64, centos.7-x64, centos.8-x64, debian.9-x64, debian.10-x64, fedora.33-x64, ubuntu.16.04-x64, ubuntu.18.04-x64, ubuntu.20.04-x64 ]
+        package: [ Executable, MsBuildFull ]
       fail-fast: false
 
     steps:
@@ -174,24 +173,19 @@ jobs:
       with:
         name: nuget
         path: ${{ github.workspace }}/artifacts/packages/nuget
-    -
-      uses: actions/[email protected]
-      name: Download native packages
-      with:
-        name: native-${{ runner.os }}
-        path: ${{ github.workspace }}/artifacts/packages/native
     -
       name: '[Test Artifacts]'
       shell: pwsh
-      run: dotnet run/artifacts.dll --target=ArtifactsTest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
+      run: dotnet run/artifacts.dll --target=Artifacts${{ matrix.package }}Test
 
-  artifacts_windows_test:
-    name: Test artifacts on windows
+  artifacts_linux_test:
+    name: Test artifacts in docker
     needs: [build]
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        package: [ Executable, MsBuildFull ]
+        targetFramework: [ '3.1', '5.0' ]
+        distro: [ alpine.3.12-x64, centos.7-x64, centos.8-x64, debian.9-x64, debian.10-x64, fedora.33-x64, ubuntu.16.04-x64, ubuntu.18.04-x64, ubuntu.20.04-x64 ]
       fail-fast: false
 
     steps:
@@ -221,10 +215,16 @@ jobs:
       with:
         name: nuget
         path: ${{ github.workspace }}/artifacts/packages/nuget
+    -
+      uses: actions/[email protected]
+      name: Download native packages
+      with:
+        name: native-${{ runner.os }}
+        path: ${{ github.workspace }}/artifacts/packages/native
     -
       name: '[Test Artifacts]'
       shell: pwsh
-      run: dotnet run/artifacts.dll --target=Artifacts${{ matrix.package }}Test
+      run: dotnet run/artifacts.dll --target=ArtifactsTest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
 
   docker_linux_images:
     name: Build, Test and Publish Docker Images
@@ -289,7 +289,7 @@ jobs:
 
   publish:
     name: Publish
-    needs: [docker_linux_images, artifacts_windows_test, artifacts_linux_test]
+    needs: [artifacts_windows_test, artifacts_linux_test, docker_linux_images]
     runs-on: windows-latest
     strategy:
       matrix:

.gitignore

@@ -106,6 +106,7 @@ site/
 # Cake
 ####################
 tools/*
+run/*
 !tools/packages.config
 /*.zip
 GitVersion.CommandLine/*/
@@ -126,7 +127,3 @@ config.wyam.hash
 config.wyam.packages.xml
 /tests/integration/core/build
 /tests/integration/full/build
-
-run/
-
-build/build/tools/

build/artifacts/Tasks/ArtifactsExecutableTest.cs

@@ -32,7 +32,7 @@ public override void Run(BuildContext context)
                 PackageTest(context, packageToTest);
             }
         }
-        private static void PackageTest(BuildContext context, string packageToTest)
+        private static void PackageTest(BuildContextBase context, string packageToTest)
         {
             if (context.Version == null)
                 return;

build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs

@@ -39,7 +39,7 @@ public override void Run(BuildContext context)
                 var dotnetCoreMsBuildSettings = new DotNetCoreMSBuildSettings();
                 dotnetCoreMsBuildSettings.WithProperty("TargetFramework", framework);
                 dotnetCoreMsBuildSettings.WithProperty("GitVersionMsBuildVersion", version);
-                var projPath = context.MakeAbsolute(new DirectoryPath("./tests/integration/core"));
+                var projPath = context.MakeAbsolute(Paths.Integration.Combine("core"));
 
                 context.DotNetCoreBuild(projPath.FullPath, new DotNetCoreBuildSettings
                 {
@@ -49,7 +49,7 @@ public override void Run(BuildContext context)
                     ArgumentCustomization = args => args.Append($"--source {nugetSource}")
                 });
 
-                var netcoreExe = new DirectoryPath("./tests/integration/core/build").Combine(framework).CombineWithFilePath("app.dll");
+                var netcoreExe = Paths.Integration.Combine("core").Combine("build").Combine(framework).CombineWithFilePath("app.dll");
                 context.ValidateOutput("dotnet", netcoreExe.FullPath, context.Version.GitVersion.FullSemVer);
             }
 
@@ -66,7 +66,7 @@ public override void Run(BuildContext context)
 
             context.MSBuild("./tests/integration/full", msBuildSettings);
 
-            var fullExe = new DirectoryPath("./tests/integration/full/build").CombineWithFilePath("app.exe");
+            var fullExe = Paths.Integration.Combine("full").Combine("build").CombineWithFilePath("app.exe");
             context.ValidateOutput(fullExe.FullPath, null, context.Version.GitVersion.FullSemVer);
         }
     }

build/artifacts/Tasks/ArtifactsNativeTest.cs

@@ -21,9 +21,9 @@ public override bool ShouldRun(BuildContext context)
 
         public override void Run(BuildContext context)
         {
-            if (context.Version == null)
+            if (context.Version?.SemVersion == null)
                 return;
-            var version = context.Version.SemVersion;
+            var version = context.Version.SemVersion.ToLower();
             var rootPrefix = string.Empty;
 
             foreach (var dockerImage in context.Images)

build/common/Utilities/DockerContextExtensions.cs

@@ -5,7 +5,6 @@
 using Cake.Common.Diagnostics;
 using Cake.Common.IO;
 using Cake.Core;
-using Cake.Core.IO;
 using Cake.Docker;
 using Xunit;
 
@@ -16,15 +15,15 @@ public static class DockerContextExtensions
         public static void DockerBuild(this BuildContextBase context, DockerImage dockerImage)
         {
             var (distro, targetFramework, registry, _) = dockerImage;
-            var workDir = DirectoryPath.FromString($"./src/Docker");
+            var workDir = Paths.Src.Combine("Docker");
             var tags = context.GetDockerTags(dockerImage);
 
             if (context.Version == null) return;
             var buildSettings = new DockerImageBuildSettings
             {
                 Rm = true,
                 Tag = tags.ToArray(),
-                File = $"{workDir}/Dockerfile",
+                File = workDir.CombineWithFilePath("Dockerfile").FullPath,
                 BuildArg = new[]
                 {
                     $"contentFolder=/content",
@@ -43,7 +42,6 @@ public static void DockerBuild(this BuildContextBase context, DockerImage docker
         public static void DockerPush(this BuildContextBase context, DockerImage dockerImage)
         {
             var tags = context.GetDockerTags(dockerImage);
-
             foreach (var tag in tags)
             {
                 context.DockerPush(tag);

build/common/Utilities/Paths.cs

@@ -10,6 +10,7 @@ public class Paths
         public static readonly DirectoryPath Src = Root.Combine("src");
         public static readonly DirectoryPath Docs = Root.Combine("docs");
         public static readonly DirectoryPath Build = Root.Combine("build");
+        public static readonly DirectoryPath Integration = Root.Combine("tests").Combine("integration");
 
         public static readonly DirectoryPath Nuspec = Build.Combine("nuspec");
 

build/docker/Tasks/DockerBuild.cs

@@ -23,7 +23,7 @@ public override bool ShouldRun(BuildContext context)
         public override void Run(BuildContext context)
         {
             var tool = Paths.Nuget.CombineWithFilePath("GitVersion.Tool*");
-            var dest = DirectoryPath.FromString($"./src/Docker").Combine("content");
+            var dest = Paths.Src.Combine("Docker").Combine("content");
             context.EnsureDirectoryExists(dest);
             context.CopyFiles(tool.FullPath, dest);
 

build/docker/Tasks/DockerPublish.cs

@@ -1,5 +1,4 @@
 using System;
-using Cake.Common.Diagnostics;
 using Cake.Frosting;
 using Common.Utilities;