update build

.github/workflows/build-mingw.yml → .github/workflows/build.yml

@@ -1,10 +1,9 @@
-name: Build with MinGW GCC
-run-name: ${{ github.actor }} is testing out GitHub Actions 🚀
+name: Build Zig package
 on: [push]
 
 jobs:
   mingw64-x64:
-    name: Build Skia with MinGW GCC
+    name: Build Skia with MinGW Clang
 
     runs-on: windows-latest
 
@@ -21,11 +20,11 @@ jobs:
           install: mingw-w64-x86_64-clang mingw-w64-x86_64-lld
 
       - name: "Clone skia"
-        run: git clone --depth 1 https://github.com/mono/skia.git
+        run: git clone --depth 1 https://github.com/mono/skia.git skia_repo
       - name: "Build skia"
         run: |
           "${{ steps.msys2.outputs.msys2-location }}/mingw64/bin/clang" --version
-          cd skia
+          cd skia_repo
           python3 tools/git-sync-deps
           python3 bin/fetch-ninja
           bin/gn gen out/lib --args='
@@ -55,12 +54,15 @@ jobs:
             cxx="${{ steps.msys2.outputs.msys2-location }}/mingw64/bin/clang++"
           '
           third_party/ninja/ninja -C out/lib skia
-          mkdir -p ../lib/skia/win-x64/lib
+          mkdir -p ../skia/lib/win-x64
           cp --recursive include ../lib/skia/win-x64/include
-          cp --recursive out/lib/*.lib ../lib/skia/win-x64/lib
-          ls out/lib
+          cp --recursive out/lib/*.lib ../skia/lib/win-x64/
+          
+          cd ..
+          rm -rf skia_repo
+          rm -rf .*
       - name: Archive the build
         uses: actions/upload-artifact@v4
         with:
-          name: windows-mingw64-x64
-          path: lib
+          name: skia-zig
+          path: .

build.zig

@@ -11,7 +11,7 @@ pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
 
     if (target.result.os.tag == .windows and target.result.abi != .msvc) {
-        std.debug.print("Error: Skia requires the `msvc` abi on Windows. Please specify the abi using the build command (e.g. `zig build -Dtarget=x86_64-windows-msvc`) or force it by overwriting the abi in build.zig: `target.query.abi = .msvc;`.", .{});
+        std.debug.print("Error: Skia requires the `msvc` abi on Windows. Please specify the abi using the build command (e.g. `zig build -Dtarget=x86_64-windows-msvc`) or force it by requesting it in the default_target of b.standardTargetOptions.", .{});
         return error.SkiaRequiresMSVConWin;
     }