Danielku15 · Oct 7, 2023 · Oct 6, 2023 · Oct 6, 2023 · Oct 6, 2023 · Oct 6, 2023
diff --git a/.github/actions/build-jni/action.yml b/.github/actions/build-jni/action.yml
@@ -20,7 +20,22 @@ runs:
     - uses: actions/download-artifact@v3
       with:
         path: dist
-    - run: ./build.cmd LibAlphaSkiaJni --target-os ${{ inputs.target-os }} --architecture ${{ inputs.architecture }} --variant ${{ inputs.variant }}
+        name: alphaskia-${{ inputs.target-os }}-${{ inputs.architecture }}-static
+
+    - id: build-info
+      run: |
+        if [ ${{ runner.os }} != 'Windows' ]; then
+          echo "script=./build.sh" >> "$GITHUB_OUTPUT"
+          echo "shell=bash" >> "$GITHUB_OUTPUT"
+        else
+          echo "script=./build.cmd" >> "$GITHUB_OUTPUT"
+          echo "shell=pwsh" >> "$GITHUB_OUTPUT"
+        fi
+      shell: bash
+
+    - run: ${{ steps.build-info.outputs.script }} LibAlphaSkiaJni --target-os ${{ inputs.target-os }} --architecture ${{ inputs.architecture }} --variant ${{ inputs.variant }}
+      shell: ${{ steps.build-info.outputs.shell }}
+
     - uses: actions/upload-artifact@v3
       with:
         name: alphaskia-${{ inputs.target-os }}-jni-${{ inputs.architecture }}-${{ inputs.variant }}

diff --git a/.github/actions/build-skia/action.yml b/.github/actions/build-skia/action.yml
@@ -17,18 +17,28 @@ inputs:
 
 runs:
   using: "composite"
-  steps: 
-    - uses: actions/checkout@v3
-      with:
-        submodules: false
-
+  steps:
     - uses: actions/cache/restore@v3
       if: ${{ inputs.use-cache }}
       with:
         path: dist
+        key: alphaskia-${{ inputs.target-os }}-${{ inputs.architecture }}-${{ inputs.variant }}-${{ github.run_id }}
         restore-keys: alphaskia-${{ inputs.target-os }}-${{ inputs.architecture }}-${{ inputs.variant }}
 
-    - run: ./build.cmd LibAlphaSkia --target-os ${{ inputs.target-os }} --architecture ${{ inputs.architecture }} --variant ${{ inputs.variant }} --use-cache ${{ inputs.use-cache }}
+    - id: build-info
+      run: |
+        if [ ${{ runner.os }} != 'Windows' ]; then
+          echo "script=./build.sh" >> "$GITHUB_OUTPUT"
+          echo "shell=bash" >> "$GITHUB_OUTPUT"
+        else
+          echo "script=./build.cmd" >> "$GITHUB_OUTPUT"
+          echo "shell=pwsh" >> "$GITHUB_OUTPUT"
+        fi
+      shell: bash
+
+    - run: ${{ steps.build-info.outputs.script }} LibAlphaSkiaWithCache --target-os ${{ inputs.target-os }} --architecture ${{ inputs.architecture }} --variant ${{ inputs.variant }} --use-cache ${{ inputs.use-cache }}
+      shell: ${{ steps.build-info.outputs.shell }}
+
     - uses: actions/upload-artifact@v3
       with:
         name: alphaskia-${{ inputs.target-os }}-${{ inputs.architecture }}-${{ inputs.variant }}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,6 +18,7 @@ jobs:
         architecture: [x64, x86, arm64]
         variant: ['shared', 'static']
     steps:
+      - uses: actions/checkout@v3
       - uses: ./.github/actions/build-skia
         with:
           use-cache: ${{ inputs.use-skia-cache }}
@@ -33,6 +34,7 @@ jobs:
         architecture: [x64, x86, arm64]
         variant: ['shared']
     steps:
+      - uses: actions/checkout@v3
       - uses: ./.github/actions/build-jni
         with:
           architecture: ${{ matrix.architecture }}
@@ -50,6 +52,7 @@ jobs:
         # TODO architecture: [x64, x86, arm64]
         variant: ['shared', 'static']
     steps:
+      - uses: actions/checkout@v3
       - uses: ./.github/actions/build-skia
         with:
           use-cache: ${{ inputs.use-skia-cache }}
@@ -66,6 +69,7 @@ jobs:
         architecture: [x64]
         variant: ['shared']
     steps:
+      - uses: actions/checkout@v3
       - uses: ./.github/actions/build-jni
         with:
           architecture: ${{ matrix.architecture }}
@@ -82,6 +86,7 @@ jobs:
         architecture: [x64, x86, arm, arm64]
         variant: ['shared', 'static']
     steps:
+      - uses: actions/checkout@v3
       - uses: ./.github/actions/build-skia
         with:
           use-cache: ${{ inputs.use-skia-cache }}
@@ -97,6 +102,7 @@ jobs:
         architecture: [x64, x86, arm, arm64]
         variant: ['shared']
     steps:
+      - uses: actions/checkout@v3
       - uses: ./.github/actions/build-jni
         with:
           architecture: ${{ matrix.architecture }}
@@ -112,6 +118,7 @@ jobs:
         architecture: [x64, arm64]
         variant: ['shared', 'static']
     steps:
+      - uses: actions/checkout@v3
       - uses: ./.github/actions/build-skia
         with:
           use-cache: ${{ inputs.use-skia-cache }}
@@ -127,6 +134,7 @@ jobs:
         architecture: [x64, arm64]
         variant: ['shared']
     steps:
+      - uses: actions/checkout@v3
       - uses: ./.github/actions/build-jni
         with:
           architecture: ${{ matrix.architecture }}
@@ -139,8 +147,6 @@ jobs:
     needs: [windows, linux, android, macos]
     steps:
     - uses: actions/checkout@v3
-      with:
-        submodules: false
     - uses: actions/download-artifact@v3
       with:
         path: dist
@@ -157,8 +163,6 @@ jobs:
     needs: [windows-jni, linux-jni, android-jni, macos-jni]
     steps:
     - uses: actions/checkout@v3
-      with:
-        submodules: false
     - uses: actions/download-artifact@v3
       with:
         path: dist

diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -106,29 +106,19 @@
           "items": {
             "type": "string",
             "enum": [
-              "AndroidJni",
-              "AndroidSkia",
-              "Compile",
-              "CompileTests",
-              "CompileWithCache",
               "DotNet",
               "DotNetBuild",
               "DotNetPack",
               "DotNetTest",
-              "GitSyncDepsJni",
-              "GitSyncDepsSkia",
+              "GitSyncDepsLibAlphaSkia",
+              "GitSyncDepsLibAlphaSkiaJni",
               "Java",
-              "LinuxJni",
-              "LinuxSkia",
-              "MacOsJni",
-              "MacOsSkia",
+              "LibAlphaSkia",
+              "LibAlphaSkiaJni",
+              "LibAlphaSkiaWithCache",
               "PatchSkiaBuildFiles",
-              "PrepareForBuild",
               "PrepareGitHubArtifacts",
-              "SetupDepotTools",
-              "WindowsJni",
-              "WindowsSkia",
-              "WithDependencies"
+              "SetupDepotTools"
             ]
           }
         },
@@ -138,32 +128,31 @@
           "items": {
             "type": "string",
             "enum": [
-              "AndroidJni",
-              "AndroidSkia",
-              "Compile",
-              "CompileTests",
-              "CompileWithCache",
               "DotNet",
               "DotNetBuild",
               "DotNetPack",
               "DotNetTest",
-              "GitSyncDepsJni",
-              "GitSyncDepsSkia",
+              "GitSyncDepsLibAlphaSkia",
+              "GitSyncDepsLibAlphaSkiaJni",
               "Java",
-              "LinuxJni",
-              "LinuxSkia",
-              "MacOsJni",
-              "MacOsSkia",
+              "LibAlphaSkia",
+              "LibAlphaSkiaJni",
+              "LibAlphaSkiaWithCache",
               "PatchSkiaBuildFiles",
-              "PrepareForBuild",
               "PrepareGitHubArtifacts",
-              "SetupDepotTools",
-              "WindowsJni",
-              "WindowsSkia",
-              "WithDependencies"
+              "SetupDepotTools"
             ]
           }
         },
+        "TargetOs": {
+          "type": "string",
+          "enum": [
+            "Android",
+            "Linux",
+            "MacOs",
+            "Windows"
+          ]
+        },
         "use-cache": {
           "type": "string"
         },

diff --git a/build/Build.Android.cs b/build/Build.Android.cs
@@ -81,7 +81,7 @@ void BuildLibAlphaSkiaJniAndroid()
         gnArgs["extra_cflags"] = $"[ '-I{alphaSkiaInclude}', '-I{jniInclude}', '-I{jniWinInclude}' ]";
 
         // Add Libs and lib search paths
-        var staticLibPath = DistBasePath / GetLibDirectory(variant: Variant.Shared);
+        var staticLibPath = DistBasePath / GetLibDirectory(variant: Variant.Static);
         gnArgs["extra_ldflags"] = $"[ '-L{staticLibPath}', '-lAlphaSkia', '-lskia' ]";
 
         BuildSkiaAndroid("libAlphaSkiaJni", gnArgs, new[] { "libAlphaSkiaJni.so" });

diff --git a/build/Build.Linux.cs b/build/Build.Linux.cs
@@ -35,7 +35,7 @@ void BuildLibAlphaSkiaJniLinux()
         gnArgs["extra_cflags"] = $"[ '-I{alphaSkiaInclude}', '-I{jniInclude}', '-I{jniWinInclude}' ]";
 
         // Add Libs and lib search paths
-        var staticLibPath = DistBasePath / GetLibDirectory(variant: Variant.Shared);
+        var staticLibPath = DistBasePath / GetLibDirectory(variant: Variant.Static);
         gnArgs["extra_ldflags"] =
             $"[ '-L{staticLibPath}', '-lAlphaSkia', '-lskia' ]";
 

diff --git a/build/Build.Native.cs b/build/Build.Native.cs
@@ -14,10 +14,17 @@
 [TypeConverter(typeof(TypeConverter<TargetOperatingSystem>))]
 public class TargetOperatingSystem : Enumeration
 {
-    public static TargetOperatingSystem Windows = new() { Value = "windows", SkiaTargetOs = "win", RuntimeIdentifier = "win" };
-    public static TargetOperatingSystem Linux = new() { Value = "linux", SkiaTargetOs = "linux", RuntimeIdentifier = "linux" };
-    public static TargetOperatingSystem Android = new() { Value = "android", SkiaTargetOs = "android", RuntimeIdentifier = "android" };
-    public static TargetOperatingSystem MacOs = new() { Value = "macos", SkiaTargetOs = "mac", RuntimeIdentifier = "macos" };
+    public static TargetOperatingSystem Windows = new()
+        { Value = "windows", SkiaTargetOs = "win", RuntimeIdentifier = "win" };
+
+    public static TargetOperatingSystem Linux = new()
+        { Value = "linux", SkiaTargetOs = "linux", RuntimeIdentifier = "linux" };
+
+    public static TargetOperatingSystem Android = new()
+        { Value = "android", SkiaTargetOs = "android", RuntimeIdentifier = "android" };
+
+    public static TargetOperatingSystem MacOs = new()
+        { Value = "macos", SkiaTargetOs = "mac", RuntimeIdentifier = "macos" };
 
     public string SkiaTargetOs { get; private set; }
     public string RuntimeIdentifier { get; private set; }
@@ -75,8 +82,11 @@ partial class Build
 
     bool UseCache => "true".Equals(UseCacheParam, StringComparison.OrdinalIgnoreCase);
 
-    public Target GitSyncDepsAlphaSkia => _ => _
+    bool SkipLibAlphaSkia => CanUseCachedBinaries("libAlphaSkia", TargetOs.RuntimeIdentifier);
+
+    public Target GitSyncDepsLibAlphaSkia => _ => _
         .Unlisted()
+        .OnlyWhenStatic(() => !SkipLibAlphaSkia)
         .DependsOn(SetupDepotTools)
         .Executes(() =>
         {
@@ -117,14 +127,32 @@ partial class Build
 
     public Target LibAlphaSkiaWithCache => _ => _
         .Unlisted()
-        .OnlyWhenStatic(() => !CanUseCachedBinaries("libAlphaSkia", TargetOs.RuntimeIdentifier))
         .Requires(() => Architecture)
         .Requires(() => Variant)
         .Requires(() => TargetOs)
+        .Before(SetupDepotTools) // ensure it runs before any oher targets
+        .Executes(() =>
+        {
+            if (SkipLibAlphaSkia)
+            {
+                FileSystemTasks.CopyDirectoryRecursively(DistBasePath, ArtifactBasePath, DirectoryExistsPolicy.Merge,
+                    FileExistsPolicy.OverwriteIfNewer);
+            }
+            else
+            {
+                GitTool("submodule update --init --recursive");
+                if (OperatingSystem.IsLinux())
+                {
+                    var dependenciesScript = SkiaPath / "tools" / "install_dependencies.sh";
+                    ToolResolver.GetPathTool("bash")($"{dependenciesScript}", workingDirectory: SkiaPath);   
+                }
+            }
+        })
         .Triggers(LibAlphaSkia);
 
     public Target LibAlphaSkia => _ => _
-        .DependsOn(GitSyncDepsAlphaSkia, PatchSkiaBuildFiles)
+        .DependsOn(GitSyncDepsLibAlphaSkia, PatchSkiaBuildFiles)
+        .OnlyWhenStatic(() => !SkipLibAlphaSkia)
         .Requires(() => Architecture)
         .Requires(() => Variant)
         .Requires(() => TargetOs)
@@ -147,7 +175,7 @@ partial class Build
                 BuildLibAlphaSkiaMacOs();
             }
         });
-    
+
     public Target LibAlphaSkiaJni => _ => _
         .DependsOn(PrepareGitHubArtifacts, GitSyncDepsLibAlphaSkiaJni, PatchSkiaBuildFiles)
         .Requires(() => Architecture)
@@ -172,7 +200,7 @@ partial class Build
                 BuildLibAlphaSkiaJniMacOs();
             }
         });
-    
+
     string GetLibDirectory(string libName = "libAlphaSkia", TargetOperatingSystem targetOs = null,
         Architecture arch = null, Variant variant = null)
     {
@@ -316,6 +344,7 @@ Dictionary<string, string> ReadDepsData(TextReader reader)
 
     public Target SetupDepotTools => _ => _
         .Unlisted()
+        .OnlyWhenStatic(() => !SkipLibAlphaSkia)
         .Executes(() =>
         {
             var oldValue = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Process);
@@ -335,6 +364,7 @@ Dictionary<string, string> ReadDepsData(TextReader reader)
 
     public Target PatchSkiaBuildFiles => _ => _
         .Unlisted()
+        .OnlyWhenStatic(() => !SkipLibAlphaSkia)
         .Executes(() =>
         {
             var buildConfigNew = new StringBuilder();
@@ -522,7 +552,7 @@ void BuildSkia(
         {
             SetClangMacOs(gnArgs);
         }
-        
+
         var isShared = Variant == Variant.Shared;
         var libDir = GetLibDirectory(buildTarget, TargetOs, Architecture, Variant);
         var distPath = DistBasePath / libDir;

diff --git a/build/Build.cs b/build/Build.cs
@@ -77,19 +77,14 @@ bool CanUseCachedBinaries(string buildTarget, string targetOsDir)
     {
         if (!UseCache)
         {
-            Log.Debug("Cache use is disabled.");
             return false;
         }
 
         if (!HasCachedFiles(buildTarget, targetOsDir))
         {
-            Log.Information("Did not find cached binaries.");
             return false;
         }
 
-        Log.Information("Can use cached binaries, copying them to artifact output");
-        FileSystemTasks.CopyDirectoryRecursively(DistBasePath, ArtifactBasePath, DirectoryExistsPolicy.Merge, FileExistsPolicy.OverwriteIfNewer);
-
         return true;
     }
 }