diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index fcb1892..8ede5f6 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -15,7 +15,6 @@ jobs: matrix: branch: - zig-stable - - zig-nightly runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v6 @@ -48,7 +47,7 @@ jobs: - name: Setup Zig uses: mlugg/setup-zig@v2 with: - version: "${{ matrix.branch == 'zig-stable' && 'latest' || 'master' }}" + version: 'master' - name: Setup git user information env: CHILD_BRANCH: "bot/${{ matrix.branch }}" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 402db34..f0e4ca0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,6 @@ on: pull_request: branches: - zig-stable - - zig-nightly jobs: linter: @@ -16,7 +15,7 @@ jobs: - name: Setup zig uses: mlugg/setup-zig@v2 with: - version: "${{ github.event.pull_request.base.ref == 'zig-stable' && 'latest' || 'master' }}" + version: 'master' - name: Check zig is canonical shell: 'bash' run: zig fmt --check . @@ -29,7 +28,7 @@ jobs: - name: Setup zig uses: mlugg/setup-zig@v2 with: - version: "${{ github.event.pull_request.base.ref == 'zig-stable' && 'latest' || 'master' }}" + version: 'master' - name: Test building example shell: 'bash' run: | @@ -48,7 +47,7 @@ jobs: - name: Setup Zig uses: mlugg/setup-zig@v2 with: - version: "${{ github.event.pull_request.base.ref == 'zig-stable' && 'latest' || 'master' }}" + version: 'master' - name: Test updating shell: 'bash' diff --git a/.gitignore b/.gitignore index 1d3d5eb..c6f4884 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ Session.vim .zig-cache/ zig-out/ +zig-pkg/ diff --git a/build.zig.zon b/build.zig.zon index e1827b7..a339c52 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -7,22 +7,19 @@ .hash = "N-V-__8AAAh4EgD_1vyfeRQed3y6urhGewfbgX0yP6g04hGv", }, .toolbox = .{ - .url = "git+https://github.com/tiawl/toolbox?ref=2.0.0#8cfe99b13c380c0a0437e9edc05ab4b961b242d6", - .hash = "toolbox-2.0.0-kRAu4EF8AAC9LKCNAHFDbj1RzTI4yczjgz7PL_9YjYqb", - .branch = "zig-stable", + .url = "git+https://github.com/tiawl/toolbox#d26b12bc2bf6bb0856a591d384cace3fd50445eb", + .hash = "toolbox-2.0.1-kRAu4DODAAC4GkZ714OgwurhfE5YXxI3BMQAlecmxa5f", }, .spirv_zig = .{ - .url = "git+https://github.com/tiawl/spirv.zig?ref=toolbox-2.0.0#2919733e4905aaf39ce9c97d1e998b93c57a03f5", - .hash = "spirv_zig-1.0.0-u_xqhzVxfQB-CxWN7LB4NZV5zcYewz-9PIPkhtxxSELL", - .branch = "zig-stable", + .url = "git+https://github.com/tiawl/spirv.zig.git#db6e8a2f177f3a44445d2857afb0837d8a232ba9", + .hash = "spirv_zig-1.0.0-u_xqh5FCfwBVVTBPbiJ3x_-WrcNwKZYeBwlNa_ogvzMs", }, .glslang_zig = .{ - .url = "git+https://github.com/tiawl/glslang.zig?ref=toolbox-2.0.0#ec5f6a0dfe592904f118613aea227860bb153eff", - .hash = "glslang_zig-1.0.0-QiUC6r7RXgBhJgb3mK5D8pyKZgroKCj5xkE1gw29mZZP", - .branch = "zig-stable", + .url = "git+https://github.com/tiawl/glslang.zig.git#01fa9389c4b60b920e542251dbeb16d3d5bcf2ca", + .hash = "glslang_zig-1.0.0-QiUC6jj1XgBBDVBMunbSiBYR38ikJymUCEkL3HHMcC-L", }, }, - .minimum_zig_version = "0.15.2", + .minimum_zig_version = "0.16.0", .fingerprint = 0x3dd9ee4ee37ce998, .paths = .{ "build.zig", diff --git a/example/build.zig b/example/build.zig index bf66f55..9cc3f97 100644 --- a/example/build.zig +++ b/example/build.zig @@ -20,7 +20,7 @@ pub fn build(builder: *std.Build) !void { .optimize = optimize, }); - exe.linkLibrary(shaderc_dep.artifact("shaderc")); + exe.root_module.linkLibrary(shaderc_dep.artifact("shaderc")); builder.installArtifact(exe); }