feat: support Zig versions 0.11.0 and 0.12.0

.github/workflows/ci.yaml

@@ -49,6 +49,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
         bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions) }}
+        zigversion: [0.12.0]
         bzlmodEnabled: [true, false]
         folder:
           - "."
@@ -59,43 +60,87 @@ jobs:
           # we only run them against the latest Bazel version.
           - os: ubuntu-latest
             bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions)[0] }}
+            zigversion: 0.12.0
             bzlmodEnabled: false
             folder: "."
             target: "//zig/tests/integration_tests"
           - os: ubuntu-latest
             bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions)[0] }}
+            zigversion: 0.12.0
             bzlmodEnabled: true
             folder: "."
             target: "//zig/tests/integration_tests"
           - os: macos-latest
             bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions)[0] }}
+            zigversion: 0.12.0
             bzlmodEnabled: true
             folder: "."
             target: "//zig/tests/integration_tests"
+          # Only test older Zig versions with the latest Bazel version
+          - os: ubuntu-latest
+            bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions)[0] }}
+            zigversion: 0.11.0
+            bzlmodEnabled: false
+            folder: "."
+            target: "//..."
+          - os: ubuntu-latest
+            bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions)[0] }}
+            zigversion: 0.11.0
+            bzlmodEnabled: true
+            folder: "."
+            target: "//..."
+          - os: macos-latest
+            bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions)[0] }}
+            zigversion: 0.11.0
+            bzlmodEnabled: true
+            folder: "."
+            target: "//..."
+          - os: ubuntu-latest
+            bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions)[0] }}
+            zigversion: 0.11.0
+            bzlmodEnabled: false
+            folder: "e2e/workspace"
+            target: "//..."
+          - os: ubuntu-latest
+            bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions)[0] }}
+            zigversion: 0.11.0
+            bzlmodEnabled: true
+            folder: "e2e/workspace"
+            target: "//..."
+          - os: macos-latest
+            bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions)[0] }}
+            zigversion: 0.11.0
+            bzlmodEnabled: true
+            folder: "e2e/workspace"
+            target: "//..."
           # Only test the latest Bazel version on MacOS (MacOS runners are expensive and slow)
           - os: macos-latest
             bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions)[0] }}
+            zigversion: 0.12.0
             bzlmodEnabled: false
             folder: "."
             target: "//..."
           - os: macos-latest
             bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions)[0] }}
+            zigversion: 0.12.0
             bzlmodEnabled: true
             folder: "."
             target: "//..."
           - os: macos-latest
             bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions)[0] }}
+            zigversion: 0.12.0
             bzlmodEnabled: false
             folder: "e2e/workspace"
             target: "//..."
           - os: macos-latest
             bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions)[0] }}
+            zigversion: 0.12.0
             bzlmodEnabled: true
             folder: "e2e/workspace"
             target: "//..."
 
     # Configure a human readable name for each job
-    name: Test ${{ matrix.target }} in ${{ matrix.folder }} with Bazel ${{ matrix.bazelversion }} and bzlmod ${{ matrix.bzlmodEnabled }} on ${{ matrix.os }}
+    name: Test ${{ matrix.target }} in ${{ matrix.folder }} with Zig ${{ matrix.zigversion }}, Bazel ${{ matrix.bazelversion }}, and bzlmod ${{ matrix.bzlmodEnabled }} on ${{ matrix.os }}
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -119,14 +164,18 @@ jobs:
           path: |
             ~/.cache/bazel
             ~/.cache/bazel-repo
-          key: bazel-cache-${{ matrix.os }}-${{ matrix.bazelversion }}-${{ matrix.bzlmodEnabled }}-${{ matrix.folder }}-${{ matrix.target }}-${{ hashFiles('**/BUILD.bazel', '**/*.bzl', '**/*.zig', 'WORKSPACE', 'WORKSPACE.bzlmod', 'MODULE.bazel') }}
+          key: bazel-cache-${{ matrix.os }}-${{ matrix.zigversion }}-${{ matrix.bazelversion }}-${{ matrix.bzlmodEnabled }}-${{ matrix.folder }}-${{ matrix.target }}-${{ hashFiles('**/BUILD.bazel', '**/*.bzl', '**/*.zig', 'WORKSPACE', 'WORKSPACE.bzlmod', 'MODULE.bazel') }}
           restore-keys: |
             bazel-cache-${{ matrix.os }}-${{ matrix.bazelversion }}-${{ matrix.bzlmodEnabled }}-${{ matrix.folder }}-${{ matrix.target }}
 
       - name: Configure Bazel version
         working-directory: ${{ matrix.folder }}
         run: echo "USE_BAZEL_VERSION=${{ matrix.bazelversion }}" > .bazeliskrc
 
+      - name: Configure Zig version
+        working-directory: ${{ matrix.folder }}
+        run: echo "build --@zig_toolchains//:version=${{ matrix.zigversion }}" > .bazelrc.user
+
       - name: Configure documentation generation
         if: matrix.folder == '.' && matrix.target == '//...'
         run: |

MODULE.bazel

@@ -15,6 +15,14 @@ register_toolchains("@rules_zig//zig/target:all")
 
 register_toolchains("@zig_toolchains//:all")
 
+zig_dev = use_extension(
+    "//zig:extensions.bzl",
+    "zig",
+    dev_dependency = True,
+)
+zig_dev.toolchain(zig_version = "0.12.0")
+zig_dev.toolchain(zig_version = "0.11.0")
+
 bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True, repo_name = "io_bazel_stardoc")
 bazel_dep(name = "gazelle", version = "0.36.0", dev_dependency = True, repo_name = "bazel_gazelle")
 bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True)

README.md

@@ -120,7 +120,7 @@ rules_zig_dependencies()
 
 zig_register_toolchains(
     name = "zig",
-    zig_version = "0.11.0",
+    zig_version = "0.12.0",
 )
 ```
 

e2e/workspace/MODULE.bazel

@@ -8,6 +8,15 @@ local_path_override(
     path = "../..",
 )
 
+zig = use_extension(
+    "@rules_zig//zig:extensions.bzl",
+    "zig",
+    dev_dependency = True,
+)
+zig.toolchain(zig_version = "0.12.0")
+zig.toolchain(zig_version = "0.11.0")
+use_repo(zig, "zig_toolchains")
+
 bazel_dep(name = "runfiles_library_dependency", dev_dependency = True)
 local_path_override(
     module_name = "runfiles_library_dependency",

e2e/workspace/WORKSPACE.bazel

@@ -45,5 +45,8 @@ rules_zig_dependencies()
 
 zig_register_toolchains(
     name = "zig",
-    zig_version = "0.11.0",
+    zig_versions = [
+        "0.12.0",
+        "0.11.0",
+    ],
 )

e2e/workspace/configure-mode/library.zig

@@ -2,7 +2,13 @@ const std = @import("std");
 const builtin = @import("builtin");
 
 comptime {
-    @export(internalName, .{ .name = @tagName(builtin.mode), .linkage = .Strong });
+    @export(internalName, .{
+        .name = @tagName(builtin.mode),
+        .linkage = if (builtin.zig_version.major == 0 and builtin.zig_version.minor == 11)
+            .Strong
+        else
+            .strong,
+    });
 }
 
 fn internalName() callconv(.C) void {}

e2e/workspace/configure-target/read_elf_arch.zig

@@ -2,7 +2,7 @@ const std = @import("std");
 const elf = std.elf;
 
 pub fn main() !void {
-    var args = try std.process.argsAlloc(std.heap.page_allocator);
+    const args = try std.process.argsAlloc(std.heap.page_allocator);
     defer std.process.argsFree(std.heap.page_allocator, args);
 
     if (args.len < 2) {

e2e/workspace/configure-target/read_pe32_arch.zig

@@ -1,7 +1,8 @@
 const std = @import("std");
+const builtin = @import("builtin");
 
 pub fn main() !void {
-    var args = try std.process.argsAlloc(std.heap.page_allocator);
+    const args = try std.process.argsAlloc(std.heap.page_allocator);
     defer std.process.argsFree(std.heap.page_allocator, args);
 
     if (args.len < 2) {
@@ -15,7 +16,10 @@ pub fn main() !void {
 fn printMachineType(allocator: std.mem.Allocator, binary_path: []const u8) !void {
     const content = try std.fs.cwd().readFileAlloc(allocator, binary_path, 1048576);
 
-    var coff = try std.coff.Coff.init(content);
+    var coff = if (builtin.zig_version.major == 0 and builtin.zig_version.minor == 11)
+        try std.coff.Coff.init(content)
+    else
+        try std.coff.Coff.init(content, false);
 
     try std.io.getStdOut().writer().print("{s}\n", .{@tagName(coff.getCoffHeader().machine)});
 }

e2e/workspace/configure-threaded/library.zig

@@ -2,7 +2,13 @@ const std = @import("std");
 const builtin = @import("builtin");
 
 comptime {
-    @export(internalName, .{ .name = if (builtin.single_threaded) "single_threaded" else "multi_threaded", .linkage = .Strong });
+    @export(internalName, .{
+        .name = if (builtin.single_threaded) "single_threaded" else "multi_threaded",
+        .linkage = if (builtin.zig_version.major == 0 and builtin.zig_version.minor == 11)
+            .Strong
+        else
+            .strong,
+    });
 }
 
 fn internalName() callconv(.C) void {}

e2e/workspace/configure-version/BUILD.bazel

@@ -34,3 +34,29 @@ zig_configure_test(
     actual = ":zig_test_0.11.0_manual",
     zig_version = "0.11.0",
 )
+
+zig_configure(
+    name = "zig_version_0.12.0",
+    actual = ":zig_version",
+    zig_version = "0.12.0",
+)
+
+diff_test(
+    name = "zig_version_test_0.12.0",
+    size = "small",
+    file1 = ":zig_version_0.12.0.expected",
+    file2 = ":zig_version_0.12.0",
+)
+
+zig_test(
+    name = "zig_test_0.12.0_manual",
+    main = "test-0.12.0.zig",
+    tags = ["manual"],
+)
+
+zig_configure_test(
+    name = "zig_test_0.12.0",
+    size = "small",
+    actual = ":zig_test_0.12.0_manual",
+    zig_version = "0.12.0",
+)

e2e/workspace/configure-version/test-0.12.0.zig

@@ -0,0 +1,6 @@
+const std = @import("std");
+const builtin = @import("builtin");
+
+test "match Zig version" {
+    try std.testing.expectEqualStrings("0.12.0", builtin.zig_version_string);
+}

e2e/workspace/configure-version/zig_version_0.12.0.expected

@@ -0,0 +1 @@
+0.12.0

e2e/workspace/link-dependencies/shared-library/BUILD.bazel

@@ -1,7 +1,16 @@
+load("@bazel_skylib//lib:selects.bzl", "selects")
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
 load("@rules_zig//zig:defs.bzl", "zig_binary", "zig_library", "zig_test")
 
+selects.config_setting_group(
+    name = "macos-zig-0.12.0",
+    match_all = [
+        "@platforms//os:macos",
+        "@zig_toolchains//:0.12.0",
+    ],
+)
+
 cc_binary(
     name = "add",
     srcs = ["add.c"],
@@ -34,6 +43,10 @@ zig_library(
         "@rules_zig//zig/lib:libc",
     ],
     main = "main.zig",
+    target_compatible_with = select({
+        ":macos-zig-0.12.0": ["@platforms//:incompatible"],
+        "//conditions:default": [],
+    }),
 )
 
 zig_test(
@@ -47,11 +60,25 @@ zig_test(
 )
 
 build_test(
-    name = "build",
+    name = "build-binary",
     size = "small",
     targets = [
         ":binary",
+    ],
+)
+
+build_test(
+    name = "build-library",
+    size = "small",
+    targets = [
         ":library",
+    ],
+)
+
+build_test(
+    name = "build-test",
+    size = "small",
+    targets = [
         ":test",
     ],
 )

e2e/workspace/runfiles-library/main.zig

@@ -1,4 +1,5 @@
 const std = @import("std");
+const builtin = @import("builtin");
 const runfiles = @import("runfiles");
 
 fn getEnvVar(allocator: std.mem.Allocator, key: []const u8) !?[]const u8 {
@@ -111,7 +112,11 @@ test "runfiles in nested binary" {
     try env.put("DATA", data_rpath);
     try r.environment(&env);
 
-    const result = try std.ChildProcess.exec(.{
+    const run = if (builtin.zig_version.major == 0 and builtin.zig_version.minor == 11)
+        std.ChildProcess.exec
+    else
+        std.ChildProcess.run;
+    const result = try run(.{
         .allocator = std.testing.allocator,
         .argv = &[_][]const u8{binary_path},
         .env_map = &env,

zig/private/common/cdeps.bzl

@@ -37,7 +37,7 @@ def _compilation_context(*, compilation_context, inputs, args):
     args.add_all(compilation_context.defines, format_each = "-D%s")
     args.add_all(compilation_context.includes, format_each = "-I%s")
 
-    # Note, Zig does not support `-iquote` as of Zig 0.11.0
+    # Note, Zig does not support `-iquote` as of Zig 0.12.0
     # args.add_all(compilation_context.quote_includes, format_each = "-iquote%s")
     args.add_all(compilation_context.quote_includes, format_each = "-I%s")
     args.add_all(compilation_context.system_includes, before_each = "-isystem")