From 06bc1ed63c66c85d18a5f599ad87cce3d343e14a Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Thu, 19 Oct 2023 21:32:22 -0700 Subject: [PATCH] fix build Signed-off-by: Stephen Gutekanst --- .github/workflows/ci.yml | 28 ++++++++++++++++------------ .github/workflows/m1_ci.yml | 4 ++-- build.zig | 2 +- build.zig.zon | 4 ++-- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f819b60b..9e7aa89d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: sudo apt install xz-utils sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.12.0-dev.1092+68ed78775.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: install (debug) - run: DAWN_FROM_SOURCE=true zig build dawn -Dcpu=x86_64_v2 -Dtarget=x86_64-linux-gnu + run: DAWN_FROM_SOURCE=true zig build install -Dcpu=x86_64_v2 -Dtarget=x86_64-linux-gnu - name: upload (debug) run: ./dev/upload-release.sh env: @@ -37,7 +37,7 @@ jobs: sudo apt install xz-utils sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.12.0-dev.1092+68ed78775.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: install (release-fast) - run: DAWN_FROM_SOURCE=true zig build dawn -Dcpu=x86_64_v2 -Doptimize=ReleaseFast -Dtarget=x86_64-linux-gnu + run: DAWN_FROM_SOURCE=true zig build install -Dcpu=x86_64_v2 -Doptimize=ReleaseFast -Dtarget=x86_64-linux-gnu - name: upload (release-fast) run: ./dev/upload-release.sh env: @@ -56,7 +56,7 @@ jobs: sudo apt install xz-utils sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.12.0-dev.1092+68ed78775.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: install (debug) - run: DAWN_FROM_SOURCE=true zig build dawn -Dtarget=x86_64-linux-musl -Dcpu=x86_64_v2 + run: DAWN_FROM_SOURCE=true zig build install -Dtarget=x86_64-linux-musl -Dcpu=x86_64_v2 - name: upload (debug) run: ./dev/upload-release.sh env: @@ -75,7 +75,7 @@ jobs: sudo apt install xz-utils sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.12.0-dev.1092+68ed78775.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: install (release-fast) - run: DAWN_FROM_SOURCE=true zig build dawn -Doptimize=ReleaseFast -Dtarget=x86_64-linux-musl -Dcpu=x86_64_v2 + run: DAWN_FROM_SOURCE=true zig build install -Doptimize=ReleaseFast -Dtarget=x86_64-linux-musl -Dcpu=x86_64_v2 - name: upload (release-fast) run: ./dev/upload-release.sh env: @@ -94,7 +94,7 @@ jobs: sudo apt install xz-utils sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.12.0-dev.1092+68ed78775.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: install (debug) - run: DAWN_FROM_SOURCE=true zig build dawn -Dtarget=aarch64-linux-gnu + run: DAWN_FROM_SOURCE=true zig build install -Dtarget=aarch64-linux-gnu - name: upload (debug) run: ./dev/upload-release.sh env: @@ -113,7 +113,7 @@ jobs: sudo apt install xz-utils sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.12.0-dev.1092+68ed78775.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: install (release-fast) - run: DAWN_FROM_SOURCE=true zig build dawn -Doptimize=ReleaseFast -Dtarget=aarch64-linux-gnu + run: DAWN_FROM_SOURCE=true zig build install -Doptimize=ReleaseFast -Dtarget=aarch64-linux-gnu - name: upload (release-fast) run: ./dev/upload-release.sh env: @@ -132,7 +132,7 @@ jobs: sudo apt install xz-utils sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.12.0-dev.1092+68ed78775.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: install (debug) - run: DAWN_FROM_SOURCE=true zig build dawn -Dtarget=aarch64-linux-musl + run: DAWN_FROM_SOURCE=true zig build install -Dtarget=aarch64-linux-musl - name: upload (debug) run: ./dev/upload-release.sh env: @@ -151,7 +151,7 @@ jobs: sudo apt install xz-utils sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.12.0-dev.1092+68ed78775.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: install (release-fast) - run: DAWN_FROM_SOURCE=true zig build dawn -Doptimize=ReleaseFast -Dtarget=aarch64-linux-musl + run: DAWN_FROM_SOURCE=true zig build install -Doptimize=ReleaseFast -Dtarget=aarch64-linux-musl - name: upload (release-fast) run: ./dev/upload-release.sh env: @@ -173,7 +173,9 @@ jobs: 7z x zig.zip Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.12.0-dev.1092+68ed78775\" - name: install (debug) - run: DAWN_FROM_SOURCE=true zig build dawn -Dtarget=x86_64-windows-gnu -Dcpu=x86_64_v2 + run: zig build install -Dtarget=x86_64-windows-gnu -Dcpu=x86_64_v2 + env: + DAWN_FROM_SOURCE: true - name: upload (debug) run: ./dev/upload-release.sh shell: bash @@ -197,7 +199,9 @@ jobs: 7z x zig.zip Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.12.0-dev.1092+68ed78775\" - name: install (release-fast) - run: DAWN_FROM_SOURCE=true zig build dawn -Dtarget=x86_64-windows-gnu -Doptimize=ReleaseFast -Dcpu=x86_64_v2 + run: zig build install -Dtarget=x86_64-windows-gnu -Doptimize=ReleaseFast -Dcpu=x86_64_v2 + env: + DAWN_FROM_SOURCE: true - name: upload (release-fast) run: ./dev/upload-release.sh shell: bash @@ -219,7 +223,7 @@ jobs: brew install xz sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-macos-x86_64-0.12.0-dev.1092+68ed78775.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: install (debug) - run: DAWN_FROM_SOURCE=true zig build dawn -Dtarget=x86_64-macos + run: DAWN_FROM_SOURCE=true zig build install -Dtarget=x86_64-macos - name: upload (debug) run: ./dev/upload-release.sh env: @@ -239,7 +243,7 @@ jobs: brew install xz sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-macos-x86_64-0.12.0-dev.1092+68ed78775.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: install (release-fast) - run: DAWN_FROM_SOURCE=true zig build dawn -Doptimize=ReleaseFast -Dtarget=x86_64-macos + run: DAWN_FROM_SOURCE=true zig build install -Doptimize=ReleaseFast -Dtarget=x86_64-macos - name: upload (release-fast) run: ./dev/upload-release.sh env: diff --git a/.github/workflows/m1_ci.yml b/.github/workflows/m1_ci.yml index b06c77edd..8b2ff8edf 100644 --- a/.github/workflows/m1_ci.yml +++ b/.github/workflows/m1_ci.yml @@ -15,7 +15,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: install (debug) - run: zig build install -Dtarget=aarch64-macos + run: DAWN_FROM_SOURCE=true zig build install -Dtarget=aarch64-macos - name: upload (debug) run: | ./dev/upload-release.sh @@ -26,7 +26,7 @@ jobs: RELEASE_NAME: aarch64-macos-none_debug GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: install (release-fast) - run: zig build install -Doptimize=ReleaseFast -Dtarget=aarch64-macos + run: DAWN_FROM_SOURCE=true zig build install -Doptimize=ReleaseFast -Dtarget=aarch64-macos - name: upload (release-fast) run: ./dev/upload-release.sh env: diff --git a/build.zig b/build.zig index afc475133..d094e526d 100644 --- a/build.zig +++ b/build.zig @@ -12,7 +12,7 @@ pub fn build(b: *Build) !void { // Just to demonstrate/test linking. This is not a functional example, see the mach/gpu examples // or Dawn C++ examples for functional example code. const example = b.addExecutable(.{ - .name = "dawn-example", + .name = "empty", .root_source_file = .{ .path = "src/main.zig" }, .target = target, .optimize = optimize, diff --git a/build.zig.zon b/build.zig.zon index 9813013cb..63994a151 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -13,8 +13,8 @@ }, .dependencies = .{ .xcode_frameworks = .{ - .url = "https://pkg.machengine.org/xcode-frameworks/e77a5c6809a0d3f62ec549ee56e9d2dc6807cd5b.tar.gz", - .hash = "12202044ed9fd69af156b0afde619ffd1d111554c557f57ab670ca9960e76d60d0b8", + .url = "https://pkg.machengine.org/xcode-frameworks/1b5863a77384f3ac633b496cf6decbf42ceb1ed2.tar.gz", + .hash = "12209ccfa1c7320f1d4eed0baf718efa9b4c8d8e42595a019a7569c2adf48d27c262", }, .direct3d_headers = .{ .url = "https://pkg.machengine.org/direct3d-headers/9617cfd497fae598610a7b0a4be0b035e7308e93.tar.gz",