Setup output verification tests

.github/actions/build-alphaskia/action.yml

@@ -20,7 +20,7 @@ runs:
   steps:
     - uses: actions/download-artifact@v3
       with:
-        path: dist
+        path: dist/.organize/libskia-${{ inputs.target-os }}-${{ inputs.architecture }}-static
         name: libskia-${{ inputs.target-os }}-${{ inputs.architecture }}-static
 
     - id: build-info
@@ -34,10 +34,20 @@ runs:
         fi
       shell: bash
 
-    - run: ${{ steps.build-info.outputs.script }} LibAlphaSkia --target-os ${{ inputs.target-os }} --architecture ${{ inputs.architecture }} --variant ${{ inputs.variant }}
+    - run: ${{ steps.build-info.outputs.script }} LibAlphaSkia LibAlphaSkiaTest --target-os ${{ inputs.target-os }} --architecture ${{ inputs.architecture }} --variant ${{ inputs.variant }}
       shell: ${{ steps.build-info.outputs.shell }}
 
     - uses: actions/upload-artifact@v3
+      if: ${{ always() }}
       with:
         name: libalphaskia-${{ inputs.target-os }}-${{ inputs.architecture }}-${{ inputs.variant }}
-        path: artifacts
+        path: artifacts
+
+    - uses: actions/upload-artifact@v3
+      if: ${{ always() }}
+      with:
+        name: libalphaskiatest-${{ inputs.target-os }}-${{ inputs.architecture }}-${{ inputs.variant }}
+        if-no-files-found: ignore
+        path: |
+          dist/libalphaskiatest-${{ inputs.target-os }}-${{ inputs.architecture }}-${{ inputs.variant }}/
+          test/test-outputs/

.github/actions/build-skia/action.yml

@@ -34,6 +34,7 @@ runs:
       shell: bash
 
     - run: ${{ steps.build-info.outputs.script }} LibSkiaWithCache --target-os ${{ inputs.target-os }} --architecture ${{ inputs.architecture }} --use-cache ${{ inputs.use-cache }}
+      id: build
       shell: ${{ steps.build-info.outputs.shell }}
 
     - uses: actions/upload-artifact@v3
@@ -42,6 +43,7 @@ runs:
         path: artifacts
 
     - uses: actions/cache/save@v3
+      if: ${{ steps.build.outputs.build-skipped != 'true' }}
       with:
         path: dist
         key: libskia-${{ inputs.target-os }}-${{ inputs.architecture }}-static-${{ github.run_id }} 

.github/workflows/build.yml

@@ -198,14 +198,40 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/download-artifact@v3
       with:
-        path: dist
+        path: dist/.organize
     - run: ./build.cmd DotNet
     - uses: actions/upload-artifact@v3
       with:
-        name: Nupkgs
+        name: nupkgs
         path: |
-          lib/dotnet/**/bin/Release/*.nupkg
-          lib/dotnet/**/bin/Release/*.snupkg
+          lib/dotnet/**/*.nupkg
+  dotnet-test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include: 
+          - runs-on: ubuntu-latest
+            architecture: x64
+          - runs-on: windows-latest
+            architecture: x64
+          - runs-on: windows-latest
+            architecture: x86
+          - runs-on: macos-latest
+            architecture: x64
+    runs-on: ${{ matrix.runs-on }}
+    needs: [dotnet]
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/download-artifact@v3
+      with:
+        name: nupkgs
+        path: dist/.organize/nupkgs
+    - run: ./build.cmd DotNetTest --architecture ${{ matrix.architecture }}
+    - uses: actions/upload-artifact@v3
+      with:
+        name: DotNet Test Results
+        path: |
+          test/test-outputs/**/*.*
 
   java:
     runs-on: ubuntu-latest
@@ -214,13 +240,40 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/download-artifact@v3
       with:
-        path: dist
+        path: dist/.organize
     - run: ./build.cmd Java
     - uses: actions/upload-artifact@v3
       with:
-        name: Maven
+        name: maven
         path: |
           lib/java/dist/**/*.*
+  java-test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include: 
+          - runs-on: ubuntu-latest
+          - runs-on: windows-latest
+          - runs-on: macos-latest
+    runs-on: ${{ matrix.runs-on }}
+    needs: [java]
+    steps:
+    - uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+    - uses: actions/checkout@v3
+    - uses: actions/download-artifact@v3
+      with:
+        name: maven
+        path: dist/.organize/maven
+    - run: ./build.cmd JavaTest
+    - uses: actions/upload-artifact@v3
+      with:
+        name: Java Test Results
+        path: |
+          test/test-outputs/**/*.*
+
 
   node:
     runs-on: ubuntu-latest
@@ -229,10 +282,34 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/download-artifact@v3
       with:
-        path: dist
+        path: dist/.organize
     - run: ./build.cmd Node
     - uses: actions/upload-artifact@v3
       with:
-        name: NodeTars
+        name: nodetars
         path: |
           lib/node/*/*.tgz
+  node-test:
+    strategy:
+      fail-fast: false
+      matrix:
+        runs-on: [ubuntu-latest, windows-latest, macos-latest]
+        node: [latest, "lts/*"]
+    runs-on: ${{ matrix.runs-on }}
+    needs: [node]
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/download-artifact@v3
+      with:
+        name: nodetars
+        path: dist/.organize/node
+    - uses: actions/setup-node@v3
+      with:
+        node-version:  ${{ matrix.node }}
+    - run: node -e "console.log(process)"
+    - run: ./build.cmd NodeTest
+    - uses: actions/upload-artifact@v3
+      with:
+        name: Node Test Results
+        path: |
+          test/test-outputs/**/*.*

.gitignore

@@ -718,4 +718,5 @@ fabric.properties
 /lib/java/local.properties
 /lib/node/**/test-outputs
 /lib/node/*/*.tgz
-/lib/dotnet/Version.props
+/lib/dotnet/Version.props
+/test/test-outputs

.nuke/build.schema.json

@@ -122,12 +122,15 @@
               "DotNetBuild",
               "DotNetPack",
               "DotNetTest",
+              "InstallDependenciesLinux",
               "Java",
               "JavaBuild",
               "JavaPack",
+              "JavaTest",
               "LibAlphaSkia",
               "LibAlphaSkiaGitSyncDeps",
               "LibAlphaSkiaPatchSkiaBuildFiles",
+              "LibAlphaSkiaTest",
               "LibSkia",
               "LibSkiaGitSyncDeps",
               "LibSkiaPatchSkiaBuildFiles",
@@ -151,12 +154,15 @@
               "DotNetBuild",
               "DotNetPack",
               "DotNetTest",
+              "InstallDependenciesLinux",
               "Java",
               "JavaBuild",
               "JavaPack",
+              "JavaTest",
               "LibAlphaSkia",
               "LibAlphaSkiaGitSyncDeps",
               "LibAlphaSkiaPatchSkiaBuildFiles",
+              "LibAlphaSkiaTest",
               "LibSkia",
               "LibSkiaGitSyncDeps",
               "LibSkiaPatchSkiaBuildFiles",

.vscode/settings.json

@@ -118,5 +118,6 @@
         "scoped_allocator": "cpp",
         "typeindex": "cpp",
         "__std_stream": "cpp",
+        "barrier": "cpp"
     }
 }

build/Architecture.cs

@@ -1,4 +1,6 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
 using Nuke.Common.Tooling;
 
 [TypeConverter(typeof(TypeConverter<Architecture>))]
@@ -25,6 +27,26 @@ public class Architecture : Enumeration
         LinuxCrossTargetArch = "aarch64-linux-gnu"
     };
 
+    public static Architecture Current
+    {
+        get
+        {
+            switch (RuntimeInformation.OSArchitecture)
+            {
+                case System.Runtime.InteropServices.Architecture.X86:
+                    return X86;
+                case System.Runtime.InteropServices.Architecture.X64:
+                    return X64;
+                case System.Runtime.InteropServices.Architecture.Arm:
+                    return Arm;
+                case System.Runtime.InteropServices.Architecture.Arm64:
+                    return Arm64;
+                default:
+                    throw new PlatformNotSupportedException("Building on this platform is not fully supported");
+            }
+        }
+    }
+
     public string LinuxArch { get; private set; }
     public string LinuxCrossToolchain { get; private set; }
     public string LinuxCrossTargetArch { get; private set; }

build/Build.DotNet.cs

@@ -1,40 +1,56 @@
+using System;
 using Nuke.Common;
 using Nuke.Common.IO;
 using Nuke.Common.Tooling;
 using Nuke.Common.Tools.DotNet;
+using Serilog;
 
 partial class Build
 {
     public Target DotNet => _ => _
         .DependsOn(DotNetPack);
-    
+
     public Target DotNetPack => _ => _
-        .Unlisted()
-        .DependsOn(DotNetTest)
-        .Executes(() =>
-        {
-            DotNetTasks.DotNetPack(_ => _
-                .SetProcessWorkingDirectory(RootDirectory / "lib" / "dotnet")
-                .SetConfiguration("Release")
-            );
-        });
-    public Target DotNetTest => _ => _
         .Unlisted()
         .DependsOn(DotNetBuild)
         .Executes(() =>
         {
-            DotNetTasks.DotNetTest(_ => _
+            if (Rebuild)
+            {
+                (TemporaryDirectory / "packages").DeleteDirectory();
+                (RootDirectory / "lib" / "dotnet")
+                    .GetFiles("*.nupkg", int.MaxValue)
+                    .DeleteFiles();
+            }
+
+            DotNetTasks.DotNetPack(_ => _
                 .SetProcessWorkingDirectory(RootDirectory / "lib" / "dotnet")
                 .SetConfiguration("Release")
             );
+
+            if (IsLocalBuild)
+            {
+                if (Rebuild)
+                {
+                    (RootDirectory / "dist" / "nupkgs").DeleteDirectory();
+                }
+
+                foreach (var nupkg in (RootDirectory / "lib" / "dotnet").GetFiles("*.nupkg", int.MaxValue))
+                {
+                    FileSystemTasks.CopyFile(nupkg,
+                        RootDirectory / "dist" / "nupkgs" / nupkg.Name,
+                        FileExistsPolicy.OverwriteIfNewer);
+                }
+            }
         });
+
     public Target DotNetBuild => _ => _
         .Unlisted()
         .DependsOn(PrepareGitHubArtifacts)
         .Executes(() =>
         {
             DotNetWriteVersionInfoProps();
-            
+
             DotNetTasks.DotNetBuild(_ => _
                 .SetProcessWorkingDirectory(RootDirectory / "lib" / "dotnet")
                 .SetConfiguration("Release")
@@ -57,7 +73,7 @@ void DotNetWriteVersionInfoProps()
         {
             semVer = $"{VersionInfo.FileVersion.ToString(3)}";
         }
-        
+
         var props = $"""
             <Project>
                 <PropertyGroup>
@@ -78,4 +94,16 @@ void DotNetWriteVersionInfoProps()
         """;
         (RootDirectory / "lib" / "dotnet" / "Version.props").WriteAllText(props);
     }
+
+    public Target DotNetTest => _ => _
+        .DependsOn(PrepareGitHubArtifacts)
+        .Executes(() =>
+        {
+            DotNetTasks.DotNetRun(_ => _
+                .SetProcessWorkingDirectory(RootDirectory / "test" / "dotnet" / "AlphaSkia.Test")
+                .SetRuntime(TargetOperatingSystem.Current.DotNetRid + "-" +
+                            (Architecture ?? Architecture.Current))
+                .AddProcessEnvironmentVariable("NUGET_PACKAGES", TemporaryDirectory / "packages")
+            );
+        });
 }