Skip to content

Commit 8bc1d90

Browse files
committed
Update dependency versions
And start using bazel-zig-cc directly.
1 parent ecaff08 commit 8bc1d90

8 files changed

Lines changed: 33 additions & 363 deletions

File tree

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.1.0
1+
6.1.0

.github/workflows/workspace_snippet.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ rust_lambda_dependencies()
4646
# Optional: if cross-compiling the Rust Lambdas, set up the Zig toolchain
4747
# and possibly other required Rust toolchains.
4848
49-
load("@rules_lambda//lambdas/toolchains:zig_repositories.bzl", "zig_register_toolchains")
49+
load("@bazel-zig-cc//toolchain:defs.bzl", zig_toolchains = "toolchains")
5050
51-
zig_register_toolchains(
52-
register = ["aarch64-linux-gnu"],
51+
zig_toolchains()
52+
53+
register_toolchains(
54+
"@zig_sdk//toolchain:linux_arm64_gnu.2.34",
5355
)
5456
5557
# Example: cross-compiles Rust from macOS to aarch64 Linux

WORKSPACE

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ node_lambda_dependencies()
1414

1515
rust_lambda_dependencies()
1616

17-
load("//lambdas/toolchains:zig_repositories.bzl", "zig_register_toolchains")
17+
load("@bazel-zig-cc//toolchain:defs.bzl", zig_toolchains = "toolchains")
1818

19-
zig_register_toolchains(
20-
register = ["aarch64-linux-gnu"],
21-
)
19+
zig_toolchains()
2220

2321
load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
2422

internal_dependencies.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
66
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
77

88
bazel_stardoc = struct(
9-
version = "0.5.2",
10-
sha = "05fb57bb4ad68a360470420a3b6f5317e4f722839abc5b17ec4ef8ed465aaa47",
9+
version = "0.5.3",
10+
sha = "3fd8fec4ddec3c670bd810904e2e33170bedfe12f90adf943508184be458c8bb",
1111
)
1212

1313
def rules_lambda_internal_dependencies():

lambdas/dependencies.bzl

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,35 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
55

66
bazel_skylib = struct(
7-
version = "1.2.1",
8-
sha = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728",
7+
version = "1.4.1",
8+
sha = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
99
)
1010

1111
aspect_bazel_lib = struct(
12-
version = "1.10.0",
13-
sha = "33332c0cd7b5238b5162b5177da7f45a05641f342cf6d04080b9775233900acf",
12+
version = "1.29.2",
13+
sha = "ee95bbc80f9ca219b93a8cc49fa19a2d4aa8649ddc9024f46abcdd33935753ca",
1414
)
1515

1616
rules_rust = struct(
17-
version = "0.9.0",
18-
sha = "6bfe75125e74155955d8a9854a8811365e6c0f3d33ed700bc17f39e32522c822",
17+
version = "0.18.0",
18+
sha = "2466e5b2514772e84f9009010797b9cd4b51c1e6445bbd5b5e24848d90e6fb2e",
1919
)
2020

2121
rules_pkg = struct(
22-
version = "0.7.0",
23-
sha = "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2",
22+
version = "0.8.1",
23+
sha = "8c20f74bca25d2d442b327ae26768c02cf3c99e93fad0381f32be9aab1967675",
2424
)
2525

2626
rules_go = struct(
2727
version = "0.34.0",
2828
sha = "16e9fca53ed6bd4ff4ad76facc9b7b651a89db1689a2877d6fd7b82aa824e366",
2929
)
3030

31+
bazel_zig_cc = struct(
32+
version = "1.0.1",
33+
sha = "e9f82bfb74b3df5ca0e67f4d4989e7f1f7ce3386c295fd7fda881ab91f83e509",
34+
)
35+
3136
# WARNING: any changes in these macros may be BREAKING CHANGES for users
3237
# if they load us before their conflicting dependencies.
3338

@@ -64,6 +69,16 @@ def rules_lambda_dependencies():
6469
sha256 = rules_pkg.sha,
6570
)
6671

72+
maybe(
73+
http_archive,
74+
name = "bazel-zig-cc",
75+
strip_prefix = "bazel-zig-cc-v{}".format(bazel_zig_cc.version),
76+
urls = [
77+
"https://git.sr.ht/~motiejus/bazel-zig-cc/archive/v{}.tar.gz".format(bazel_zig_cc.version),
78+
],
79+
sha256 = bazel_zig_cc.sha,
80+
)
81+
6782
def rust_lambda_dependencies():
6883
maybe(
6984
http_archive,

lambdas/toolchains/BUILD.bazel

Whitespace-only changes.

lambdas/toolchains/zig_repositories.bzl

Lines changed: 0 additions & 192 deletions
This file was deleted.

0 commit comments

Comments
 (0)