FIx archive handling in CI

Author: cuberoot

.github/workflows/dawn.yaml

@@ -155,7 +155,9 @@ jobs:
       - name: Download all build artifacts
         uses: actions/download-artifact@v5
         with:
+          pattern: dawn-build-*
           path: Dawn/builds/
+          merge-multiple: true
 
       - name: Download Dawn version
         uses: actions/download-artifact@v5
@@ -187,7 +189,7 @@ jobs:
       - name: Download bundle artifact
         uses: actions/download-artifact@v5
         with:
-          pattern: dawn-build-*
+          name: dawn-webgpu-bundle
           path: dawn-bundle/
           merge-multiple: true
 

Dawn/dawn_builder.py

@@ -27,6 +27,7 @@
 class BuildDawnError(Exception): pass
 class SDKPathNotFoundError(BuildDawnError): pass
 class CMakeError(BuildDawnError): pass
+class CMakeBuildError(BuildDawnError): pass
 class UploadArchiverError(BuildDawnError): pass
 # fmt: on
 
@@ -59,6 +60,15 @@ def is_apple(self) -> bool:
         """
         return self in [OS.MACOS, OS.IPHONE, OS.IPADOS]
 
+    def is_windows(self) -> bool:
+        """
+        Check if this OS is Windows.
+
+        Returns:
+            True if this is a Windows OS
+        """
+        return self == OS.WINDOWS
+
 
 def get_current_os() -> OS:
     """
@@ -90,6 +100,7 @@ class TargetConfig:
     sdk: Optional[str] = None
     deployment_target: Optional[str] = None
     debug: bool = False
+    build_tool: str = "Ninja"
 
     def __str__(self) -> str:
         """
@@ -259,10 +270,10 @@ def build_dawn(
 
     cmake_exec = shutil.which("cmake", path=os.environ.get("PATH"))
 
-    # Run cmake command
+    # Run cmake command to create the build files
     try:
         subprocess.run(
-            [cmake_exec, "-GNinja", *flags, str(dawn_path)],
+            [cmake_exec, f"-G{target_config.build_tool}", *flags, str(dawn_path)],
             env=os.environ,
             cwd=build_dir,
             capture_output=True,
@@ -273,9 +284,22 @@ def build_dawn(
         _subprocess_exception_message(e)
         raise CMakeError
 
-    # Run ninja command
-    ninja_exec = shutil.which("ninja", path=os.environ.get("PATH"))
-    subprocess.run([ninja_exec], cwd=build_dir, check=True)
+    # Run the cmake build command
+    try:
+        subprocess.run(
+            [
+                cmake_exec,
+                "--build",
+                ".",
+                "--config",
+                "Debug" if target_config.debug else "Release",
+            ],
+            cwd=build_dir,
+            check=True,
+        )
+    except subprocess.CalledProcessError as e:
+        _subprocess_exception_message(e)
+        raise CMakeBuildError
 
     # Install the library and headers
     try:

Dawn/dawn_source.patch

@@ -0,0 +1,13 @@
+diff --git a/src/cmake/DawnLibrary.cmake b/src/cmake/DawnLibrary.cmake
+index a5352433f0..fbdcb260db 100644
+--- a/src/cmake/DawnLibrary.cmake
++++ b/src/cmake/DawnLibrary.cmake
+@@ -182,7 +182,7 @@ function(dawn_install_target name)
+   # When building in debug mode with MSVC, install PDB files together with binaries
+   if (MSVC)
+     get_target_property(target_type "${name}" TYPE)
+-    if ((target_type STREQUAL "STATIC_LIBRARY") OR (target_type STREQUAL "SHARED_LIBRARY") OR (target_type STREQUAL "EXECUTABLE"))
++    if ((target_type STREQUAL "SHARED_LIBRARY") OR (target_type STREQUAL "EXECUTABLE"))
+       install(FILES $<TARGET_PDB_FILE:${name}> DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
+     endif()
+   endif (MSVC)

Dawn/dawn_source.py

@@ -155,6 +155,19 @@ def fetch_dawn_source(hash: str) -> None:
     except subprocess.CalledProcessError as e:
         raise GitOperationError(f"Failed to checkout Dawn repository: {e.stderr}")
 
+    # Apply the patch to the Dawn source
+    print("Applying patch to Dawn source...")
+    try:
+        subprocess.run(
+            ["git", "apply", "../dawn_source.patch"],
+            cwd=str(get_dawn_path()),
+            check=True,
+            capture_output=True,
+            text=True,
+        )
+    except subprocess.CalledProcessError as e:
+        raise GitOperationError(f"Failed to apply patch to Dawn repository: {e.stderr}")
+
     # Verify Dawn tools directory and fetch dawn dependencies
     dawn_source_tools = dest_dir / "tools" / "fetch_dawn_dependencies.py"
     if not dawn_source_tools.exists():