dotnet · Perksey · Nov 4, 2024 · May 22, 2024 · May 22, 2024 · May 22, 2024
@@ -16,7 +16,9 @@ jobs:
         token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
     - name: Checkout submodules, configure git.
       run: |
-          git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive
+          # Keep this in sync with generator.json!
+          git -c submodule.third_party/git-hooks.update=none submodule update --init --depth 0 build/submodules/Vulkan-Headers build/submodules/Assimp build/submodules/SDL build/submodules/webgpu-headers build/submodules/dawn build/submodules/SPIRV-Headers build/submodules/SPIRV-Reflect build/submodules/SPIRV-Cross build/submodules/shaderc
+          git submodule update --init --depth 0 --recursive build/submodules/wgpu-native
           git config --local user.email "9011267+dotnet-bot@users.noreply.github.com"
           git config --local user.name "The Silk.NET Automaton"
     - name: Setup .NET Core
@@ -44,11 +46,6 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 3.1.404
-    - name: Setup NUKE
-      run: dotnet tool install Nuke.GlobalTool --global
-    - name: Install Workloads
-      # TODO: This is slow. Maybe we can make a docker container with this already done?
-      run: dotnet workload install android ios maccatalyst
     - uses: GuillaumeFalourd/setup-windows10-sdk-action@v1.9
       name: Setup Windows 11 SDK
       with:

@@ -17,9 +17,10 @@ jobs:
       fail-fast: false
       matrix:
         env:
-          - os: ubuntu-latest
-            name: Linux
-            nuke_invoke: ./build.sh
+          - os: windows-2022
+            name: Windows
+            nuke_invoke: ./build.cmd
+            extras: ""
     name: ${{ matrix.env.name }} Build
     runs-on: ${{ matrix.env.os }}
     steps:
@@ -43,6 +44,7 @@ jobs:
           dotnet-version: |
             6.0.201
             7.0.*
+            8.0.*
       - name: Build Shaderc
         run: ${{ matrix.env.nuke_invoke }} Shaderc
         env:

@@ -19,34 +19,17 @@ jobs:
       matrix:
         env:
           - os: ubuntu-22.04
-            name: Linux
+            name: Linux x64
             nuke_invoke: ./build.sh
-            extras: |
-              # We need to adjust APT sources for multiarch. Use the ones corresponding to
-              # Ubuntu 22.04 with appropriate `arch` values. ports.ubuntu.com is required
-              # for armhf and arm64.
-              sudo tee /etc/apt/sources.list << EOF
-              deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy main multiverse restricted universe
-              deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe
-              deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-security main multiverse restricted universe
-              deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe
-              deb [arch=arm64,armhf] http://ports.ubuntu.com jammy main multiverse restricted universe
-              deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-backports main multiverse restricted universe
-              deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-security main multiverse restricted universe
-              deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-updates main multiverse restricted universe
-              deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy main multiverse restricted universe
-              deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe
-              deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-security main multiverse restricted universe
-              deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe
-              EOF
-              sudo dpkg --add-architecture arm64
-              sudo dpkg --add-architecture armhf
-              sudo apt update
-              sudo apt install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf
-              sudo apt install -y g++-aarch64-linux-gnu g++-arm-linux-gnueabihf
-              for arch in amd64 arm64 armhf; do
-                sudo apt install -y libx11-xcb-dev:$arch
-              done
+            nuke_extra: --matrix-arg linux-x64
+          - os: ubuntu-22.04
+            name: Linux ARM32
+            nuke_invoke: ./build.sh
+            nuke_extra: --matrix-arg linux-arm
+          - os: ubuntu-22.04
+            name: Linux ARM64
+            nuke_invoke: ./build.sh
+            nuke_extra: --matrix-arg linux-arm64
           - os: windows-2022
             name: Windows
             nuke_invoke: ./build.cmd
@@ -83,7 +66,10 @@ jobs:
           dotnet-version: |
             6.0.201
             7.0.*
+      - name: Install Zig
+        if: ${{ matrix.env.os == 'ubuntu-22.04' }}
+        uses: goto-bus-stop/setup-zig@v2
       - name: Build SwiftShader
-        run: ${{ matrix.env.nuke_invoke }} SwiftShader
+        run: ${{ matrix.env.nuke_invoke }} SwiftShader ${{ matrix.env.nuke_extra }}
         env:
           PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
@@ -46,10 +46,10 @@ jobs:
               for arch in amd64 arm64 armhf; do
                 sudo apt install -y libx11-xcb-dev:$arch libxkbcommon-dev:$arch libwayland-dev:$arch libxrandr-dev:$arch
               done
-              wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240417/llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz
+              wget https://github.com/mstorsjo/llvm-mingw/releases/download/20241015/llvm-mingw-20241015-msvcrt-ubuntu-20.04-x86_64.tar.xz
               sudo mkdir /opt/llvm-mingw-msvcrt
-              sudo tar xf llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz --strip-components 1 -C /opt/llvm-mingw-msvcrt
-              rm llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz
+              sudo tar xf llvm-mingw-20241015-msvcrt-ubuntu-20.04-x86_64.tar.xz --strip-components 1 -C /opt/llvm-mingw-msvcrt
+              rm llvm-mingw-20241015-msvcrt-ubuntu-20.04-x86_64.tar.xz
           - os: windows-2022
             name: Windows
            nuke_invoke: ./build.cmd

@@ -67,6 +67,10 @@
             "VSCode"
           ]
         },
+        "MatrixArg": {
+          "type": "string",
+          "description": "Matrix job argument e.g. a RID for native builds"
+        },
         "MsbuildProperties": {
           "type": "array",
           "description": "Extra properties passed to MSBuild commands",

@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME "Linux")
 set(CMAKE_SYSTEM_PROCESSOR "aarch64")
 
-set(CMAKE_ASM_COMPILER "/usr/bin/aarch64-linux-gnu-as")
+set(CMAKE_ASM_COMPILER "/usr/bin/aarch64-linux-gnu-gcc")
 set(CMAKE_C_COMPILER "/usr/bin/aarch64-linux-gnu-gcc")
 set(CMAKE_CXX_COMPILER "/usr/bin/aarch64-linux-gnu-g++")
 

@@ -1,21 +1,21 @@
 set(CMAKE_SYSTEM_NAME "Windows")
 set(CMAKE_SYSTEM_PROCESSOR "aarch64")
 
-set(CMAKE_ASM_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-as")
+set(CMAKE_ASM_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-gcc")
 set(CMAKE_C_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-gcc")
 set(CMAKE_CXX_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-g++")
 set(CMAKE_RC_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-windres")
 
-set(CMAKE_ADDR2LINE "/usr/bin/aarch64-w64-mingw32-addr2line")
-set(CMAKE_AR "/usr/bin/aarch64-w64-mingw32-ar")
-set(CMAKE_DLLTOOL "/usr/bin/aarch64-w64-mingw32-dlltool")
+set(CMAKE_ADDR2LINE "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-addr2line")
+set(CMAKE_AR "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-ar")
+set(CMAKE_DLLTOOL "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-dlltool")
 set(CMAKE_LINKER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-ld")
-set(CMAKE_NM "/usr/bin/aarch64-w64-mingw32-nm")
-set(CMAKE_OBJCOPY "/usr/bin/aarch64-w64-mingw32-objcopy")
-set(CMAKE_OBJDUMP "/usr/bin/aarch64-w64-mingw32-objdump")
-set(CMAKE_RANLIB "/usr/bin/aarch64-w64-mingw32-ranlib")
-set(CMAKE_READELF "/usr/bin/aarch64-w64-mingw32-readelf")
-set(CMAKE_STRIP "/usr/bin/aarch64-w64-mingw32-strip")
+set(CMAKE_NM "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-nm")
+set(CMAKE_OBJCOPY "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-objcopy")
+set(CMAKE_OBJDUMP "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-objdump")
+set(CMAKE_RANLIB "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-ranlib")
+set(CMAKE_READELF "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-readelf")
+set(CMAKE_STRIP "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-strip")
 
 set(CMAKE_FIND_ROOT_PATH "/opt/llvm-mingw-msvcrt/aarch64-w64-mingw32")
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)

@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME "Linux")
 set(CMAKE_SYSTEM_PROCESSOR "armv7l")
 
-set(CMAKE_ASM_COMPILER "/usr/bin/arm-linux-gnueabihf-as")
+set(CMAKE_ASM_COMPILER "/usr/bin/arm-linux-gnueabihf-gcc")
 set(CMAKE_C_COMPILER "/usr/bin/arm-linux-gnueabihf-gcc")
 set(CMAKE_CXX_COMPILER "/usr/bin/arm-linux-gnueabihf-g++")
 

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Origignal script from https://github.com/ziglang/zig/issues/4911
+# Modified to add SILKDOTNET_ paths in response to some issues with SwiftShader
+
+args=""
+for arg in "$@"
+do
+    parg="$arg"
+
+    option=${arg%=*}
+    target=${arg#*=}
+    if [[ $option == "-march" || $option == "-mcpu" || $option == "-mtune" ]]; then
+        moveon=0
+        for replace in $SILKDOTNET_ReplaceArchitectureZigCcFlags
+        do
+            replacetarget=${replace%=*}
+            replacement=${replace#*=}
+            # echo $replacetarget A $replacement B $target END
+            if [[ $replacetarget == $target ]]; then
+                if [[ "$replacement" == "" ]]; then
+                    moveon=1
+                else
+                    target="$replacement"
+                fi
+            fi
+        done
+        if [[ $moveon == 1 || "$SILKDOTNET_RemoveAllPotentiallyProblematicZigCcFlags" == "1" ]]; then
+            continue
+        else
+            fixedTarget=${target//-/_}
+            parg="$option=$fixedTarget"
+        fi
+    fi
+    args="$args $parg"
+done
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME "Linux")
 set(CMAKE_SYSTEM_PROCESSOR "x86_64")
 
-set(CMAKE_ASM_COMPILER "/usr/bin/x86_64-linux-gnu-as")
+set(CMAKE_ASM_COMPILER "/usr/bin/x86_64-linux-gnu-gcc")
 set(CMAKE_C_COMPILER "/usr/bin/x86_64-linux-gnu-gcc")
 set(CMAKE_CXX_COMPILER "/usr/bin/x86_64-linux-gnu-g++")
 

@@ -0,0 +1,2 @@
+@echo off
+zig ar %*
@@ -0,0 +1,2 @@
+#!/bin/sh
+zig ar "$@"
@@ -0,0 +1,3 @@
+@echo off
+: TODO add -march/-mtune handling if necessary
+zig c++ %*
@@ -0,0 +1,3 @@
+#!/bin/bash
+. "$(dirname ${BASH_SOURCE[0]})/fudge.sh" $args
+zig c++ $args
@@ -0,0 +1,3 @@
+@echo off
+: TODO add -march/-mtune handling if necessary
+zig cc %*
@@ -0,0 +1,3 @@
+#!/bin/bash
+. "$(dirname ${BASH_SOURCE[0]})/fudge.sh" $args
+zig cc $args
@@ -0,0 +1,2 @@
+@echo off
+zig ranlib %*
@@ -0,0 +1,2 @@
+#!/bin/sh
+zig ranlib "$@"
@@ -0,0 +1,2 @@
+@echo off
+zig rc %*
@@ -0,0 +1,2 @@
+#!/bin/sh
+zig rc "$@"
@@ -0,0 +1,2 @@
+set(ZIG_TARGET "aarch64-linux-gnu.2.17")
+include(${CMAKE_CURRENT_LIST_DIR}/zig-toolchain.cmake)
@@ -0,0 +1,2 @@
+set(ZIG_TARGET "arm-linux-gnueabihf.2.17")
+include(${CMAKE_CURRENT_LIST_DIR}/zig-toolchain.cmake)
@@ -0,0 +1,2 @@
+set(ZIG_TARGET "x86_64-linux-gnu.2.17")
+include(${CMAKE_CURRENT_LIST_DIR}/zig-toolchain.cmake)
@@ -0,0 +1,40 @@
+include_guard()
+
+if(CMAKE_GENERATOR MATCHES "Visual Studio")
+    message(FATAL_ERROR "Visual Studio generator not supported, use: cmake -G Ninja")
+endif()
+
+if(NOT ZIG_TARGET MATCHES "^([a-zZ-Z0-9_]+)-([a-zZ-Z0-9_]+)-([a-zZ-Z0-9_.]+)$")
+    message(FATAL_ERROR "Expected -DZIG_TARGET=<arch>-<os>-<abi>")
+endif()
+
+set(ZIG_ARCH ${CMAKE_MATCH_1})
+set(ZIG_OS ${CMAKE_MATCH_2})
+set(ZIG_ABI ${CMAKE_MATCH_3})
+
+if(ZIG_OS STREQUAL "linux")
+    set(CMAKE_SYSTEM_NAME "Linux")
+elseif(ZIG_OS STREQUAL "windows")
+    set(CMAKE_SYSTEM_NAME "Windows")
+elseif(ZIG_OS STREQUAL "macos")
+    set(CMAKE_SYSTEM_NAME "Darwin")
+else()
+    message(WARNING "Unknown OS: ${ZIG_OS}")
+endif()
+
+set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_SYSTEM_PROCESSOR ${ZIG_ARCH})
+
+if(WIN32)
+    set(SCRIPT_SUFFIX ".cmd")
+else()
+    set(SCRIPT_SUFFIX ".sh")
+endif()
+
+# This is working (thanks to Simon for finding this trick)
+set(CMAKE_AR "${CMAKE_CURRENT_LIST_DIR}/zig-ar${SCRIPT_SUFFIX}")
+set(CMAKE_RANLIB "${CMAKE_CURRENT_LIST_DIR}/zig-ranlib${SCRIPT_SUFFIX}")
+set(CMAKE_RC_COMPILER "${CMAKE_CURRENT_LIST_DIR}/zig-rc${SCRIPT_SUFFIX}")
+set(CMAKE_ASM_COMPILER "${CMAKE_CURRENT_LIST_DIR}/zig-cc${SCRIPT_SUFFIX}" -target ${ZIG_TARGET})
+set(CMAKE_C_COMPILER "${CMAKE_CURRENT_LIST_DIR}/zig-cc${SCRIPT_SUFFIX}" -target ${ZIG_TARGET})
+set(CMAKE_CXX_COMPILER "${CMAKE_CURRENT_LIST_DIR}/zig-c++${SCRIPT_SUFFIX}" -target ${ZIG_TARGET})
@@ -24,7 +24,6 @@ partial class Build
     Target RegenerateBindings => CommonTarget
     (
         x => x.After(Clean)
-            .DependsOn(Restore)
             .Executes
             (
                 () =>

@@ -38,6 +38,9 @@ partial class Build
     [Nuke.Common.Parameter("Outputs build warnings instead of keeping the MSBuild logging quiet with just errors.")]
     bool Warnings;
 
+    [Parameter("Matrix job argument e.g. a RID for native builds."), CanBeNull]
+    string MatrixArg;
+
     static int IndexOfOrThrow(string x, char y)
     {
         var idx = x.IndexOf(y);
@@ -49,15 +52,16 @@ static int IndexOfOrThrow(string x, char y)
         return idx;
     }
 
-    Dictionary<string, string> CreateEnvVarDictionary()
+    Dictionary<string, string> CreateEnvVarDictionary([CanBeNull] IReadOnlyDictionary<string, string> concat = null)
         => Environment.GetEnvironmentVariables()
             .Cast<DictionaryEntry>()
+            .Concat((concat ?? Enumerable.Empty<KeyValuePair<string, string>>()).Select(x => new DictionaryEntry(x.Key, x.Value)))
             .ToDictionary(x => (string) x.Key, x => (string) x.Value);
 
-    IProcess InheritedShell(string cmd, [CanBeNull] string workDir = null)
+    IProcess InheritedShell(string cmd, [CanBeNull] string workDir = null, [CanBeNull] IReadOnlyDictionary<string, string> envVars = null)
         => OperatingSystem.IsWindows()
-            ? StartProcess("powershell", $"-Command {cmd.DoubleQuote()}", workDir, CreateEnvVarDic
10000
tionary())
-            : StartProcess("bash", $"-c {cmd.DoubleQuote()}", workDir, CreateEnvVarDictionary());
+            ? StartProcess("powershell", $"-Command {cmd.DoubleQuote()}", workDir, CreateEnvVarDictionary(envVars))
+            : StartProcess("bash", $"-c {cmd.DoubleQuote()}", workDir, CreateEnvVarDictionary(envVars));
 
     void AddToPath(string dir)
     {

@@ -39,7 +39,7 @@ partial class Build {
                     var buildDir = AssimpPath / "build";
                     var runtimes = RootDirectory / "src" / "Native" / "Silk.NET.Assimp.Native" / "runtimes";
 
-                    var prepare = "cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DASSIMP_WARNINGS_AS_ERRORS=OFF -DASSIMP_BUILD_TESTS=OFF";
+                    var prepare = "cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DASSIMP_BUILD_ZLIB=ON -DASSIMP_WARNINGS_AS_ERRORS=OFF -DASSIMP_BUILD_TESTS=OFF";
                     var build = $"cmake --build . --config Release{JobsArg}";
 
                     if (OperatingSystem.IsWindows())

@@ -75,7 +75,7 @@ public void PrUpdatedNativeBinary(string name)
                     $"git commit -m \"New binaries for {name} on {RuntimeInformation.OSDescription}\""
                 )
                 .AssertWaitForExit();
-            if (!commitCmd.Output.Any(x => x.Text.Contains("no changes added to commit", StringComparison.OrdinalIgnoreCase) || x.Text.Contains("nothing to commit", StringComparison.OrdinalIgnoreCase)))
+            if (!commitCmd.Output.Any(x => x.Text.Contains("no changes added to commit", StringComparison.OrdinalIgnoreCase) || x.Text.Contains("nothing", StringComparison.OrdinalIgnoreCase)))
             {
                 commitCmd.AssertZeroExitCode();
             }

@@ -123,15 +123,15 @@ pub fn build(b: *std.Build) void {
                     { //Windows
                         //Build for Windows x86_64
                         InheritedShell($"zig build {releaseMode} -Dtarget=x86_64-windows --verbose", SPIRVCrossPath).AssertZeroExitCode();
-                        CopyFile(SPIRVCrossPath / "zig-out" / "lib" / "spirv-cross.dll", runtimes / "win-x64" / "native" / "spirv-cross.dll", FileExistsPolicy.Overwrite);
+                        CopyFile(SPIRVCrossPath / "zig-out" / "bin" / "spirv-cross.dll", runtimes / "win-x64" / "native" / "spirv-cross.dll", FileExistsPolicy.Overwrite);
 
                         //Build for Windows x86
                         InheritedShell($"zig build {releaseMode} -Dtarget=x86-windows --verbose", SPIRVCrossPath).AssertZeroExitCode();
-                        CopyFile(SPIRVCrossPath / "zig-out" / "lib" / "spirv-cross.dll", runtimes / "win-x86" / "native" / "spirv-cross.dll", FileExistsPolicy.Overwrite);
+                        CopyFile(SPIRVCrossPath / "zig-out" / "bin" / "spirv-cross.dll", runtimes / "win-x86" / "native" / "spirv-cross.dll", FileExistsPolicy.Overwrite);
 
                         //Build for Windows arm64
                         InheritedShell($"zig build {releaseMode} -Dtarget=aarch64-windows --verbose", SPIRVCrossPath).AssertZeroExitCode();
-                        CopyFile(SPIRVCrossPath / "zig-out" / "lib" / "spirv-cross.dll", runtimes / "win-arm64" / "native" / "spirv-cross.dll", FileExistsPolicy.Overwrite);
+                        CopyFile(SPIRVCrossPath / "zig-out" / "bin" / "spirv-cross.dll", runtimes / "win-arm64" / "native" / "spirv-cross.dll", FileExistsPolicy.Overwrite);
                     }
 
                     { //MacOS
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		set(ZIG_TARGET "aarch64-linux-gnu.2.17")
		include(${CMAKE_CURRENT_LIST_DIR}/zig-toolchain.cmake)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		set(ZIG_TARGET "arm-linux-gnueabihf.2.17")
		include(${CMAKE_CURRENT_LIST_DIR}/zig-toolchain.cmake)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		set(ZIG_TARGET "x86_64-linux-gnu.2.17")
		include(${CMAKE_CURRENT_LIST_DIR}/zig-toolchain.cmake)