zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpu-dawn: move mach-glfw cloning to CI script for now

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-02-11 15:31:49 -07:00 • committed by Stephen Gutekanst
parent 8035e30ad8
commit c0901d4006
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gpu-dawn/.github/workflows/ci.yml vendored
View file

@ -15,6 +15,8 @@ jobs:
run: | run: |
sudo apt install xz-utils 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' 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 - name: test
run: zig build test && find zig-out/ run: zig build test && find zig-out/
# TODO(build-system): enable windows CI here once gpu-dawn builds under Windows # TODO(build-system): enable windows CI here once gpu-dawn builds under Windows
@ -48,6 +50,8 @@ jobs:
run: | run: |
brew install xz 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' 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 - name: test
run: zig build test && find zig-out/ run: zig build test && find zig-out/
env: env:

2
gpu-dawn/.github/workflows/m1_ci.yml vendored
View file

@ -19,6 +19,8 @@ jobs:
- name: Setup Zig - name: Setup Zig
run: | run: |
zig version zig version
- name: Clone mach-glfw
run: git clone https://github.com/hexops/mach-glfw libs/mach-glfw
- name: test - name: test
run: zig build test && find zig-out/ run: zig build test && find zig-out/
env: env:

6
gpu-dawn/build.zig
View file

@ -7,12 +7,6 @@ pub fn build(b: *Builder) void {
const mode = b.standardReleaseOptions(); const mode = b.standardReleaseOptions();
const target = b.standardTargetOptions(.{}); 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"); const lib = b.addStaticLibrary("gpu", "src/main.zig");
lib.setBuildMode(mode); lib.setBuildMode(mode);
lib.setTarget(target); lib.setTarget(target);