diff --git a/gpu-dawn/.github/workflows/ci.yml b/gpu-dawn/.github/workflows/ci.yml index 86ed5ec1..e4471f42 100644 --- a/gpu-dawn/.github/workflows/ci.yml +++ b/gpu-dawn/.github/workflows/ci.yml @@ -15,6 +15,8 @@ jobs: run: | sudo apt install xz-utils sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.9.0-dev.2023+16b753549.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + - name: Clone mach-glfw + run: git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: test run: zig build test && find zig-out/ # TODO(build-system): enable windows CI here once gpu-dawn builds under Windows @@ -48,6 +50,8 @@ jobs: run: | brew install xz sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.9.0-dev.2023+16b753549.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + - name: Clone mach-glfw + run: git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: test run: zig build test && find zig-out/ env: diff --git a/gpu-dawn/.github/workflows/m1_ci.yml b/gpu-dawn/.github/workflows/m1_ci.yml index 319477e2..cc349a1c 100644 --- a/gpu-dawn/.github/workflows/m1_ci.yml +++ b/gpu-dawn/.github/workflows/m1_ci.yml @@ -19,6 +19,8 @@ jobs: - name: Setup Zig run: | zig version + - name: Clone mach-glfw + run: git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: test run: zig build test && find zig-out/ env: diff --git a/gpu-dawn/build.zig b/gpu-dawn/build.zig index 328da9e3..5d7c8637 100644 --- a/gpu-dawn/build.zig +++ b/gpu-dawn/build.zig @@ -7,12 +7,6 @@ pub fn build(b: *Builder) void { const mode = b.standardReleaseOptions(); const target = b.standardTargetOptions(.{}); - // TODO(build-system): remove dependency on GLFW (Dawn no longer requires it / we can - // eliminate it.) - if (!dirExists("libs/mach-glfw")) { - try gitClone(b.allocator, "https://github.com/hexops/mach-glfw", "libs/mach-glfw"); - } - const lib = b.addStaticLibrary("gpu", "src/main.zig"); lib.setBuildMode(mode); lib.setTarget(target);