Skip to content

chore(bazel): move capnp dep to bzlmod #5357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

chore(bazel): move capnp dep to bzlmod #5357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0f2fcde
chore(bazel): move capnp dep to bzlmod
alexeagle Oct 20, 2025
576a65d
chore: add a script to update it
alexeagle Oct 21, 2025
61b708b
add minimal amount of rust to bzlmod?
alexeagle Oct 21, 2025
6c3e657
make DCAPNP_PRIVATE more robust to repo name mangling
alexeagle Oct 22, 2025
db80a80
more scripting
alexeagle Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ build:windows --copt='/Zc:dllexportInlines-'
build:parse_headers --features=parse_headers --process_headers_in_dependencies
# Silence some capnproto warnings/errors that are not relevant for header parsing
build:parse_headers --per_file_copt='.*\.h@-Wno-unused-function,-Wno-pragma-system-header-outside-header'
build:parse_headers --per_file_copt=external/capnp-cpp/src/kj/common.h@-Wno-unreachable-code
build:parse_headers --per_file_copt=external/capnp-cpp/src/capnp/arena.h@-DCAPNP_PRIVATE
build:parse_headers --per_file_copt='external/.*capnp-cpp/src/kj/common.h@-Wno-unreachable-code'
build:parse_headers --per_file_copt='external/.*capnp-cpp/src/capnp/arena.h@-DCAPNP_PRIVATE'

# optimized configuration
build:opt -c opt
Expand Down
4 changes: 3 additions & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,12 @@ http_file(
# downstream build.
bazel_dep(name = "boringssl", version = "0.20251002.0", repo_name = "ssl")

include("//build/deps:deps.MODULE.bazel")
include("//build/deps:cpp.MODULE.bazel")

include("//build/deps:nodejs.MODULE.bazel")

include("//build/deps:python.MODULE.bazel")

include("//build/deps:rust.MODULE.bazel")

include("//build/deps:v8.MODULE.bazel")
4 changes: 0 additions & 4 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ load("@//build/deps:gen/shared_deps.bzl", shared_deps_gen = "deps_gen")

shared_deps_gen()

load("@//build/deps:gen/deps.bzl", "deps_gen")

deps_gen()

# ========================================================================================
# Rust bootstrap

Expand Down
8 changes: 8 additions & 0 deletions build/deps/deps.MODULE.bazel → build/deps/cpp.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,14 @@ archive_override(
# Libraries which are not on the BCR
http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "capnp-cpp",
sha256 = "03f11165d64c0941c66e749554d3eaf0ea29b6ebe445a82e21557dc68caf6e28",
strip_prefix = "capnproto-capnproto-164284a/c++",
type = "tgz",
url = "https://github.com/capnproto/capnproto/tarball/164284a476eee4bfbcf7cce2a9a82fb156504210",
)

http_archive(
name = "nbytes",
build_file = "//:build/BUILD.nbytes",
Expand Down
13 changes: 0 additions & 13 deletions build/deps/deps.jsonc
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions build/deps/gen/dep_capnp_cpp.bzl
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions build/deps/gen/deps.bzl
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build/deps/rust.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bazel_dep(name = "rules_rust", version = "0.65.0")
24 changes: 24 additions & 0 deletions build/deps/update-capnp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash

set -o errexit -o nounset -o pipefail

# Get the most recent commit from the v2 branch
freeze_commit="${COMMIT:-$(git ls-remote https://github.com/capnproto/capnproto.git refs/heads/v2 | cut -f1)}"
tarball_url="https://github.com/capnproto/capnproto/tarball/${freeze_commit}"

# Calculate SHA256 of the tarball
if [ -z "${SHA256:-}" ]; then
echo "Fetching tarball to calculate SHA256..."
temp_file=$(mktemp)
curl -sL "$tarball_url" -o "$temp_file"
sha256=$(shasum -a 256 "$temp_file" | cut -d' ' -f1)
rm "$temp_file"
echo "Calculated SHA256: $sha256"
else
sha256="$SHA256"
fi
target="//build/deps/cpp.MODULE.bazel:capnp-cpp"

buildozer "set url \"$tarball_url\"" $target
buildozer "set strip_prefix \"capnproto-capnproto-${freeze_commit:0:7}/c++\"" $target
buildozer "set sha256 \"${sha256}\"" $target
2 changes: 1 addition & 1 deletion build/deps/update-deps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
SCRIPT_DIR = Path(os.environ["BUILD_WORKSPACE_DIRECTORY"]) / "build" / "deps"

GEN_DIR = SCRIPT_DIR / "gen"
ALL_DEPS = ["deps.jsonc", "build_deps.jsonc", "shared_deps.jsonc"]
ALL_DEPS = ["build_deps.jsonc", "shared_deps.jsonc"]


TOP = "# WARNING: THIS FILE IS AUTOGENERATED BY update-deps.py DO NOT EDIT\n"
Expand Down