Skip to content

Commit c95ab39

Browse files
authored
Merge branch 'main' into alexeagle/bzlmod5
2 parents 1e45c70 + 65adf5b commit c95ab39

File tree

80 files changed

+607
-455
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+607
-455
lines changed

.bazelignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
node_modules
2+
3+
# Nested modules
4+
build/google-benchmark
5+
build/perfetto
6+
build/workerd-v8

.github/workflows/codspeed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
name: Run benchmarks
2727
runs-on: ubuntu-22.04
2828
env:
29-
BAZEL_ARGS: --config=benchmark --@codspeed//core:codspeed_mode=instrumentation --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev
29+
BAZEL_ARGS: --config=benchmark --@workerd-google-benchmark//:codspeed_mode=instrumentation --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev
3030
steps:
3131
- uses: actions/checkout@v4
3232
with:

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,5 @@ MODULE.bazel.lock
3838

3939
coverage
4040
perf.data
41+
42+
.claude

MODULE.bazel

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"Bazel dependencies, see https://registry.bazel.build"
2+
23
module(name = "workerd")
34

45
bazel_dep(name = "aspect_bazel_lib", version = "2.21.1")
@@ -17,7 +18,6 @@ bazel_dep(name = "platforms", version = "1.0.0")
1718
# needs to be pulled in before rules_cc for this toolchain to actually be used.
1819
bazel_dep(name = "apple_support", version = "1.23.1")
1920
bazel_dep(name = "rules_cc", version = "0.2.8")
20-
2121
bazel_dep(name = "zlib", version = "1.3.1.bcr.6")
2222
git_override(
2323
module_name = "zlib",
@@ -38,7 +38,11 @@ git_override(
3838
bazel_dep(name = "boringssl", version = "0.20250818.0", repo_name = "ssl")
3939

4040
include("//build/deps:deps.MODULE.bazel")
41+
4142
include("//build/deps:nodejs.MODULE.bazel")
43+
4244
include("//build/deps:python.MODULE.bazel")
45+
4346
include("//build/deps:pyodide.MODULE.bazel")
47+
4448
include("//build/deps:v8.MODULE.bazel")

WORKSPACE

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,6 @@ load("//:build/rust_toolchains.bzl", "rust_toolchains")
1919

2020
rust_toolchains()
2121

22-
# Tell workerd code where to find google-benchmark with CodSpeed.
23-
#
24-
# We indirect through `@workerd-google-benchmark` to allow dependents to override how and where
25-
# google-benchmark is built, similar to the v8 setup above.
26-
new_local_repository(
27-
name = "workerd-google-benchmark",
28-
build_file_content = """cc_library(
29-
name = "benchmark",
30-
deps = [ "@codspeed//google_benchmark:benchmark" ],
31-
visibility = ["//visibility:public"])
32-
33-
cc_library(
34-
name = "benchmark_main",
35-
deps = [ "@codspeed//google_benchmark:benchmark_main" ],
36-
visibility = ["//visibility:public"])""",
37-
path = "empty",
38-
)
39-
4022
# rust-based lolhtml dependency, including the API header.
4123
# Presented as a separate repository to allow overrides.
4224
new_local_repository(

build/deps/build_deps.jsonc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,6 @@
4949
"file_regex": "^cargo-bazel-x86_64-pc-windows-msvc.exe$",
5050
"file_type": "executable",
5151
"downloaded_file_path": "downloaded.exe"
52-
},
53-
// microbenchmark
54-
{
55-
"name": "codspeed",
56-
"type": "github_release",
57-
"owner": "CodSpeedHQ",
58-
"repo": "codspeed-cpp"
5952
}
6053
]
6154
}

build/deps/deps.MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ http_archive(
128128

129129
http_archive(
130130
name = "simdutf",
131-
url = "https://github.com/simdutf/simdutf/releases/download/v7.4.0/singleheader.zip",
132-
sha256 = "b92e186ff44840edd1350f57e6c75144d912407045a3057450014cf9b2014a83",
133131
build_file = "//:build/BUILD.simdutf",
132+
sha256 = "b92e186ff44840edd1350f57e6c75144d912407045a3057450014cf9b2014a83",
133+
url = "https://github.com/simdutf/simdutf/releases/download/v7.4.0/singleheader.zip",
134134
)

build/deps/gen/build_deps.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ load("@//build/deps:gen/dep_cargo_bazel_linux_x64.bzl", "dep_cargo_bazel_linux_x
55
load("@//build/deps:gen/dep_cargo_bazel_macos_arm64.bzl", "dep_cargo_bazel_macos_arm64")
66
load("@//build/deps:gen/dep_cargo_bazel_macos_x64.bzl", "dep_cargo_bazel_macos_x64")
77
load("@//build/deps:gen/dep_cargo_bazel_win_x64.bzl", "dep_cargo_bazel_win_x64")
8-
load("@//build/deps:gen/dep_codspeed.bzl", "dep_codspeed")
98
load("@//build/deps:gen/dep_rules_rust.bzl", "dep_rules_rust")
109

1110
def deps_gen():
@@ -15,4 +14,3 @@ def deps_gen():
1514
dep_cargo_bazel_macos_x64()
1615
dep_cargo_bazel_macos_arm64()
1716
dep_cargo_bazel_win_x64()
18-
dep_codspeed()

build/deps/gen/dep_capnp_cpp.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
load("@//:build/http.bzl", "http_archive")
44

5-
URL = "https://github.com/capnproto/capnproto/tarball/c525eb1680bdd94f3d814f81f148643ee5086525"
6-
STRIP_PREFIX = "capnproto-capnproto-c525eb1/c++"
7-
SHA256 = "7b60e840dbc62bb3140a9dff9ae38253688fc63722dcea6769108e9356e6362b"
5+
URL = "https://github.com/capnproto/capnproto/tarball/d132cc56e71c76d68bc88fe332ea6f125ec5d3b4"
6+
STRIP_PREFIX = "capnproto-capnproto-d132cc5/c++"
7+
SHA256 = "fb42331d8f1b718c00db5fde4e01f34fe7e176949289adee1aebc6df8acda543"
88
TYPE = "tgz"
9-
COMMIT = "c525eb1680bdd94f3d814f81f148643ee5086525"
9+
COMMIT = "d132cc56e71c76d68bc88fe332ea6f125ec5d3b4"
1010

1111
def dep_capnp_cpp():
1212
http_archive(

build/deps/gen/dep_codspeed.bzl

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

0 commit comments

Comments
 (0)