Skip to content

Commit 013336c

Browse files
authored
Merge pull request #469 from aherrmann/zig-update-0.14.1
chore: update Zig versions up to 0.14.1
2 parents 3a6d667 + 75c5bed commit 013336c

File tree

13 files changed

+111
-4
lines changed

13 files changed

+111
-4
lines changed

MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ zig_dev = use_extension(
2222
"zig",
2323
dev_dependency = True,
2424
)
25+
zig_dev.toolchain(zig_version = "0.14.1")
2526
zig_dev.toolchain(zig_version = "0.14.0")
2627
zig_dev.toolchain(zig_version = "0.13.0")
2728
zig_dev.toolchain(zig_version = "0.12.1")

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ rules_zig_dependencies()
120120

121121
zig_register_toolchains(
122122
name = "zig",
123-
zig_version = "0.14.0",
123+
zig_version = "0.14.1",
124124
)
125125
```
126126

e2e/workspace/MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ zig = use_extension(
1414
"zig",
1515
dev_dependency = True,
1616
)
17+
zig.toolchain(zig_version = "0.14.1")
1718
zig.toolchain(zig_version = "0.14.0")
1819
zig.toolchain(zig_version = "0.13.0")
1920
zig.toolchain(zig_version = "0.12.1")

e2e/workspace/WORKSPACE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ rules_zig_dependencies()
9494
zig_register_toolchains(
9595
name = "zig",
9696
zig_versions = [
97+
"0.14.1",
9798
"0.14.0",
9899
"0.13.0",
99100
"0.12.1",

e2e/workspace/cc-dependencies/emit-header/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ zig_library(
1111
target_compatible_with = select({
1212
# -femit-h was broken on Zig 0.14.0
1313
"@zig_toolchains//:0.14.0": ["@platforms//:incompatible"],
14+
"@zig_toolchains//:0.14.1": ["@platforms//:incompatible"],
1415
"//conditions:default": [],
1516
}),
1617
)
@@ -24,6 +25,7 @@ zig_shared_library(
2425
target_compatible_with = select({
2526
# -femit-h was broken on Zig 0.14.0
2627
"@zig_toolchains//:0.14.0": ["@platforms//:incompatible"],
28+
"@zig_toolchains//:0.14.1": ["@platforms//:incompatible"],
2729
"//conditions:default": [],
2830
}),
2931
)

e2e/workspace/configure-version/BUILD.bazel

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,29 @@ zig_configure_test(
138138
actual = ":zig_test_0.14.0_manual",
139139
zig_version = "0.14.0",
140140
)
141+
142+
zig_configure(
143+
name = "zig_version_0.14.1",
144+
actual = ":zig_version",
145+
zig_version = "0.14.1",
146+
)
147+
148+
diff_test(
149+
name = "zig_version_test_0.14.1",
150+
size = "small",
151+
file1 = ":zig_version_0.14.1.expected",
152+
file2 = ":zig_version_0.14.1",
153+
)
154+
155+
zig_test(
156+
name = "zig_test_0.14.1_manual",
157+
main = "test-0.14.1.zig",
158+
tags = ["manual"],
159+
)
160+
161+
zig_configure_test(
162+
name = "zig_test_0.14.1",
163+
size = "small",
164+
actual = ":zig_test_0.14.1_manual",
165+
zig_version = "0.14.1",
166+
)
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
const std = @import("std");
2+
const builtin = @import("builtin");
3+
4+
test "match Zig version" {
5+
try std.testing.expectEqualStrings("0.14.1", builtin.zig_version_string);
6+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.14.1

zig/private/repo/toolchains_repo.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
9797
build_content += """
9898
# Use this build flag to select the Zig SDK version. E.g.
9999
#
100-
# $ bazel build --@zig_toolchains//:version=0.14.0 //...
100+
# $ bazel build --@zig_toolchains//:version=0.14.1 //...
101101
#
102102
string_flag(
103103
name = "version",

zig/private/versions.bzl

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,40 @@ def _parse(json_string):
1818

1919
TOOL_VERSIONS = _parse("""\
2020
{
21+
"0.14.1": {
22+
"aarch64-linux": {
23+
"tarball": "https://ziglang.org/download/0.14.1/zig-aarch64-linux-0.14.1.tar.xz",
24+
"shasum": "f7a654acc967864f7a050ddacfaa778c7504a0eca8d2b678839c21eea47c992b"
25+
},
26+
"aarch64-macos": {
27+
"tarball": "https://ziglang.org/download/0.14.1/zig-aarch64-macos-0.14.1.tar.xz",
28+
"shasum": "39f3dc5e79c22088ce878edc821dedb4ca5a1cd9f5ef915e9b3cc3053e8faefa"
29+
},
30+
"aarch64-windows": {
31+
"tarball": "https://ziglang.org/download/0.14.1/zig-aarch64-windows-0.14.1.zip",
32+
"shasum": "b5aac0ccc40dd91e8311b1f257717d8e3903b5fefb8f659de6d65a840ad1d0e7"
33+
},
34+
"x86-linux": {
35+
"tarball": "https://ziglang.org/download/0.14.1/zig-x86-linux-0.14.1.tar.xz",
36+
"shasum": "4bce6347fa112247443cb0952c19e560d1f90b910506cf895fd07a7b8d1c4a76"
37+
},
38+
"x86-windows": {
39+
"tarball": "https://ziglang.org/download/0.14.1/zig-x86-windows-0.14.1.zip",
40+
"shasum": "3ee730c2a5523570dc4dc1b724f3e4f30174ebc1fa109ca472a719586a473b18"
41+
},
42+
"x86_64-linux": {
43+
"tarball": "https://ziglang.org/download/0.14.1/zig-x86_64-linux-0.14.1.tar.xz",
44+
"shasum": "24aeeec8af16c381934a6cd7d95c807a8cb2cf7df9fa40d359aa884195c4716c"
45+
},
46+
"x86_64-macos": {
47+
"tarball": "https://ziglang.org/download/0.14.1/zig-x86_64-macos-0.14.1.tar.xz",
48+
"shasum": "b0f8bdfb9035783db58dd6c19d7dea89892acc3814421853e5752fe4573e5f43"
49+
},
50+
"x86_64-windows": {
51+
"tarball": "https://ziglang.org/download/0.14.1/zig-x86_64-windows-0.14.1.zip",
52+
"shasum": "554f5378228923ffd558eac35e21af020c73789d87afeabf4bfd16f2e6feed2c"
53+
}
54+
},
2155
"0.14.0": {
2256
"aarch64-linux": {
2357
"tarball": "https://ziglang.org/download/0.14.0/zig-linux-aarch64-0.14.0.tar.xz",

0 commit comments

Comments
 (0)