diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 918742e..e6d8b8f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -27,7 +27,7 @@ jobs: uses: actions/configure-pages@v5 - uses: mlugg/setup-zig@v1 with: - version: 0.15.0-dev.375+8f8f37fb0 + version: 0.15.0-dev.441+c1649d586 - run: make docs - name: Upload artifact uses: actions/upload-pages-artifact@v3 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dc23f58..0e7dce5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - zig: ["0.14.0", "0.15.0-dev.375+8f8f37fb0"] + zig: ["0.14.0", "0.15.0-dev.441+c1649d586"] runs-on: ${{matrix.os}} diff --git a/build/luajit.zig b/build/luajit.zig index d47fabd..636113e 100644 --- a/build/luajit.zig +++ b/build/luajit.zig @@ -28,7 +28,13 @@ pub fn configure(b: *Build, target: Build.ResolvedTarget, optimize: std.builtin. .optimize = .ReleaseSafe, }); minilua.linkLibC(); - minilua.root_module.sanitize_c = false; + // FIXME: remove branch when zig-0.15 is released and 0.14 can be dropped + const builtin = @import("builtin"); + if (builtin.zig_version.major == 0 and builtin.zig_version.minor < 15) { + minilua.root_module.sanitize_c = false; + } else { + minilua.root_module.sanitize_c = .off; + } minilua.addCSourceFile(.{ .file = upstream.path("src/host/minilua.c") }); // Generate the buildvm_arch.h file using minilua @@ -79,7 +85,12 @@ pub fn configure(b: *Build, target: Build.ResolvedTarget, optimize: std.builtin. .optimize = .ReleaseSafe, }); buildvm.linkLibC(); - buildvm.root_module.sanitize_c = false; + // FIXME: remove branch when zig-0.15 is released and 0.14 can be dropped + if (builtin.zig_version.major == 0 and builtin.zig_version.minor < 15) { + buildvm.root_module.sanitize_c = false; + } else { + buildvm.root_module.sanitize_c = .off; + } // Needs to run after the buildvm_arch.h and luajit.h files are generated buildvm.step.dependOn(&dynasm_run.step); @@ -183,7 +194,12 @@ pub fn configure(b: *Build, target: Build.ResolvedTarget, optimize: std.builtin. .files = &luajit_vm, }); - lib.root_module.sanitize_c = false; + // FIXME: remove branch when zig-0.15 is released and 0.14 can be dropped + if (builtin.zig_version.major == 0 and builtin.zig_version.minor < 15) { + lib.root_module.sanitize_c = false; + } else { + lib.root_module.sanitize_c = .off; + } lib.installHeader(upstream.path("src/lua.h"), "lua.h"); lib.installHeader(upstream.path("src/lualib.h"), "lualib.h");