Skip to content

Commit 96d0db0

Browse files
committed
Don’t archive intermediate build products and fix Windows paths
1 parent 0a4a916 commit 96d0db0

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/workflows/dawn.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,9 @@ jobs:
139139
uses: actions/upload-artifact@v4
140140
with:
141141
name: dawn-build-${{ matrix.target }}
142-
path: Dawn/builds/
142+
path: |
143+
Dawn/builds/
144+
!Dawn/builds/*/out
143145
retention-days: 1
144146

145147
create-bundle:

Dawn/archive_builder.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ def write_target_manifest(
3131
"libraryPath": str(target_dir / "lib"),
3232
"includePath": str(target_dir / "include"),
3333
"supportedTriples": target_config.triples(),
34+
"libraryName": "libwebgpu_dawn.lib"
35+
if target_config.os.is_windows()
36+
else "libwebgpu_dawn.a",
3437
}
3538
manifest_file.write_text(json.dumps(manifest, indent=2))
3639

@@ -62,7 +65,9 @@ def write_bundle_manifest(version: str) -> None:
6265

6366
target_manifests = [
6467
{
65-
"path": str(pathlib.Path(manifest["targetName"]) / "libwebgpu_dawn.a"),
68+
"path": (
69+
pathlib.Path(manifest["targetName"]) / manifest["libraryName"]
70+
).as_posix(),
6671
"staticLibraryMetadata": {"headerPaths": ["include"]},
6772
"supportedTriples": manifest["supportedTriples"],
6873
}
@@ -96,9 +101,9 @@ def build_bundle_target(target_config: TargetConfig) -> None:
96101
target_dir = build_dir / target_name / "install"
97102
target_dir.mkdir(exist_ok=True, parents=True)
98103

99-
manifset_dir = build_dir / "manifest"
100-
manifset_dir.mkdir(exist_ok=True, parents=True)
101-
manifest_file = manifset_dir / f"{target_name}.json"
104+
manifest_dir = build_dir / "manifest"
105+
manifest_dir.mkdir(exist_ok=True, parents=True)
106+
manifest_file = manifest_dir / f"{target_name}.json"
102107

103108
dawn_builder.build_dawn(dawn_path, target_dir, target_config)
104109
write_target_manifest(manifest_file, target_config)

0 commit comments

Comments
 (0)