Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
56b4d3a
chore(bazel): replace hermetic_cc_toolchain (zig cc) with hermetic-llvm
basvandijk Aug 1, 2026
0a02727
Updating container images to tag: 07037fcf3c305a5202b4b410dfb37652f21…
Aug 1, 2026
9069293
fix: keep host library dirs out of hermetic links; pin glibc 2.31; ma…
basvandijk Aug 1, 2026
d17ec08
Updating container images to tag: e1c2cfd7ead3abac7afb1142d5090b35a25…
Aug 1, 2026
4f666de
fix: link the cc_toolchain's static C++ runtime where rules_rust drop…
basvandijk Aug 2, 2026
b744de6
test on RBE
basvandijk Aug 2, 2026
22336f5
chore: drop the zig-era ASan runtime workaround from the fuzzing flags
basvandijk Aug 2, 2026
bf271f1
chore: simplify the pkg-config wrapper to a plain pipeline
basvandijk Aug 2, 2026
ed51d0f
chore: drop libusb-1.0-0-dev from the dev container
basvandijk Aug 2, 2026
729a451
Updating container images to tag: 827366520f53ae0ab466ed38c5103df6d67…
Aug 2, 2026
488ec31
remove comments referring to the old situation
basvandijk Aug 2, 2026
41aa621
chore: narrow the upb linker workaround to -z nostart-stop-gc
basvandijk Aug 2, 2026
225dd8d
address code review comments
basvandijk Aug 3, 2026
12f84ae
chore: suppress the unused --unwindlib=none warning instead of allowi…
basvandijk Aug 3, 2026
d50e777
chore: patch the pkg-config crate instead of wrapping the pkg-config …
basvandijk Aug 3, 2026
b9559b5
Merge remote-tracking branch 'origin/master' into bas/hermetic-llvm
basvandijk Aug 3, 2026
b8ac66d
Merge remote-tracking branch 'origin/master' into bas/hermetic-llvm
basvandijk Aug 3, 2026
8ec152c
Automatically updated Cargo*.lock
Aug 3, 2026
b2bbcab
Merge remote-tracking branch 'origin/master' into bas/hermetic-llvm
basvandijk Aug 3, 2026
919fe0f
Revert "test on RBE"
basvandijk Aug 3, 2026
8bda9f7
rm comment about a patch that is already inside the patch
basvandijk Aug 3, 2026
bdcb0d4
rm unneeded toolchain: //bazel:hermetic_cc_linux_x86_64_to_linux_aarch64
basvandijk Aug 3, 2026
8dba92e
Add reference to hermetic-llvm issue about the pkg-config patch
basvandijk Aug 4, 2026
4b3183b
Merge remote-tracking branch 'origin/master' into bas/hermetic-llvm
basvandijk Aug 4, 2026
aa6f87b
Merge remote-tracking branch 'origin/master' into bas/hermetic-llvm
basvandijk Aug 4, 2026
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
2 changes: 1 addition & 1 deletion .claude/skills/run-in-dev-container/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: Use when you need to run a command (build, test, tool) inside the I

`./ci/container/container-run.sh` runs a command inside the pinned IC dev
container (the `ghcr.io/dfinity/ic-dev` image), bind-mounting the repo checkout
at `/ic` and reusing `~/.cache` for the Bazel/cargo/zig caches.
at `/ic` and reusing `~/.cache` for the Bazel/cargo caches.

Prefer running builds and build tooling through it: it gives you the exact,
pinned toolchain environment, and standardizing on the container — regardless of
Expand Down
7 changes: 1 addition & 6 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
],
"workspaceMount": "source=${localWorkspaceFolder},target=/ic,type=bind",
"workspaceFolder": "/ic",
"initializeCommand": "mkdir -p ~/.aws ~/.ssh ~/.cache/cargo ~/.cache/zig-cache ~/.claude ~/.local/share/fish /tmp/ict_testnets && touch ~/.zsh_history ~/.bash_history",
"initializeCommand": "mkdir -p ~/.aws ~/.ssh ~/.cache/cargo ~/.claude ~/.local/share/fish /tmp/ict_testnets && touch ~/.zsh_history ~/.bash_history",
"postStartCommand": "/ic/ci/container/init.sh",
"containerEnv": {
"CARGO_TARGET_DIR": "/home/ubuntu/.cache/cargo",
Expand All @@ -26,11 +26,6 @@
"target": "/home/ubuntu/.cache",
"type": "bind"
},
{
"source": "${localEnv:HOME}/.cache/zig-cache",
"target": "/tmp/zig-cache",
"type": "bind"
},
{
"source": "${localEnv:HOME}/.ssh",
"target": "/home/ubuntu/.ssh",
Expand Down
3 changes: 0 additions & 3 deletions .github/actions/bazel/bin/bazel
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ shift
# Extra args we'll be injecting
bazel_args=( )

# Setup zig-cache
mkdir -p /tmp/zig-cache

# Add some options for build-like commands
if [[ $bazel_command == "build" ]] || [[ $bazel_command == "test" ]]; then
command_timestamp=$(date +%s)
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,6 @@ jobs:
- uses: ./.github/actions/netrc
- name: Build and Test
run: |
mkdir -p /tmp/zig-cache

bazel \
--noworkspace_rc \
--bazelrc=./bazel/conf/.bazelrc.build --bazelrc=/tmp/bazel-cache.bazelrc \
Expand Down
62 changes: 28 additions & 34 deletions Cargo.Bazel.json.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "4eb6d15fe0a50be732d31728d688bf3379b4bf80fa3a63f6e0f4ec8d81ed4d3d",
"checksum": "5ba95e88e177d66c865dd08ab5bef7cd2929c8988aff35377a6cedaabc83a8bf",
"crates": {
"actix-codec 0.5.1": {
"name": "actix-codec",
Expand Down Expand Up @@ -4964,14 +4964,14 @@
],
"license_file": "LICENSE-APACHE"
},
"aws-lc-rs 1.17.1": {
"aws-lc-rs 1.17.3": {
"name": "aws-lc-rs",
"version": "1.17.1",
"version": "1.17.3",
"package_url": "https://github.com/aws/aws-lc-rs",
"repository": {
"Http": {
"url": "https://static.crates.io/crates/aws-lc-rs/1.17.1/download",
"sha256": "4342d8937fc7e5dd9b1c60292261c0670c882a2cd1719cfc11b1af41731e32ad"
"url": "https://static.crates.io/crates/aws-lc-rs/1.17.3/download",
"sha256": "00bdb5da18dac48ca2cc7cd4a98e533e8635a58e2361d13a1a4ee3888e0d72f1"
}
},
"targets": [
Expand Down Expand Up @@ -5019,11 +5019,11 @@
"deps": {
"common": [
{
"id": "aws-lc-rs 1.17.1",
"id": "aws-lc-rs 1.17.3",
"target": "build_script_build"
},
{
"id": "aws-lc-sys 0.42.0",
"id": "aws-lc-sys 0.43.0",
"target": "aws_lc_sys"
},
{
Expand All @@ -5038,7 +5038,7 @@
"selects": {}
},
"edition": "2021",
"version": "1.17.1"
"version": "1.17.3"
},
"build_script_attrs": {
"compile_data_glob": [
Expand All @@ -5053,13 +5053,13 @@
"link_deps": {
"common": [
{
"id": "aws-lc-sys 0.42.0",
"id": "aws-lc-sys 0.43.0",
"target": "aws_lc_sys"
}
],
"selects": {}
},
"links": "aws_lc_rs_1_17_1_sys"
"links": "aws_lc_rs_1_17_3_sys"
},
"license": "ISC AND (Apache-2.0 OR ISC)",
"license_ids": [
Expand All @@ -5068,14 +5068,14 @@
],
"license_file": "LICENSE"
},
"aws-lc-sys 0.42.0": {
"aws-lc-sys 0.43.0": {
"name": "aws-lc-sys",
"version": "0.42.0",
"version": "0.43.0",
"package_url": "https://github.com/aws/aws-lc-rs",
"repository": {
"Http": {
"url": "https://static.crates.io/crates/aws-lc-sys/0.42.0/download",
"sha256": "6d9ceb1da931507a12f4fccea479dccd00da1943e1b4ae72d8e502d707361444"
"url": "https://static.crates.io/crates/aws-lc-sys/0.43.0/download",
"sha256": "43103168cc76fe62678a375e722fc9cb3a0146159ac5828bc4f0dfd755c2224c"
}
},
"targets": [
Expand Down Expand Up @@ -5118,14 +5118,14 @@
"deps": {
"common": [
{
"id": "aws-lc-sys 0.42.0",
"id": "aws-lc-sys 0.43.0",
"target": "build_script_main"
}
],
"selects": {}
},
"edition": "2021",
"version": "0.42.0"
"version": "0.43.0"
},
"build_script_attrs": {
"compile_data_glob": [
Expand Down Expand Up @@ -5165,7 +5165,7 @@
]
}
},
"links": "aws_lc_0_42_0"
"links": "aws_lc_0_43_0"
},
"license": "ISC AND (Apache-2.0 OR ISC) AND Apache-2.0 AND MIT AND BSD-3-Clause AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR ISC OR MIT-0)",
"license_ids": [
Expand Down Expand Up @@ -12184,13 +12184,7 @@
"repository": {
"Http": {
"url": "https://static.crates.io/crates/cc/1.2.48/download",
"sha256": "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a",
"patch_args": [
"-p1"
],
"patches": [
"@@//bazel:cc_rs.patch"
]
"sha256": "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a"
}
},
"targets": [
Expand Down Expand Up @@ -30997,7 +30991,7 @@
"deps": {
"common": [
{
"id": "aws-lc-rs 1.17.1",
"id": "aws-lc-rs 1.17.3",
"target": "aws_lc_rs"
},
{
Expand Down Expand Up @@ -31171,7 +31165,7 @@
"deps": {
"common": [
{
"id": "aws-lc-rs 1.17.1",
"id": "aws-lc-rs 1.17.3",
"target": "aws_lc_rs"
},
{
Expand Down Expand Up @@ -39395,7 +39389,7 @@
"deps": {
"common": [
{
"id": "aws-lc-rs 1.17.1",
"id": "aws-lc-rs 1.17.3",
"target": "aws_lc_rs"
},
{
Expand Down Expand Up @@ -60528,7 +60522,7 @@
"deps": {
"common": [
{
"id": "aws-lc-rs 1.17.1",
"id": "aws-lc-rs 1.17.3",
"target": "aws_lc_rs"
},
{
Expand Down Expand Up @@ -62022,7 +62016,7 @@
"deps": {
"common": [
{
"id": "aws-lc-rs 1.17.1",
"id": "aws-lc-rs 1.17.3",
"target": "aws_lc_rs"
},
{
Expand Down Expand Up @@ -62103,7 +62097,7 @@
"deps": {
"common": [
{
"id": "aws-lc-rs 1.17.1",
"id": "aws-lc-rs 1.17.3",
"target": "aws_lc_rs"
},
{
Expand Down Expand Up @@ -66663,7 +66657,7 @@
"deps": {
"common": [
{
"id": "aws-lc-rs 1.17.1",
"id": "aws-lc-rs 1.17.3",
"target": "aws_lc_rs"
},
{
Expand Down Expand Up @@ -66722,7 +66716,7 @@
"link_deps": {
"common": [
{
"id": "aws-lc-rs 1.17.1",
"id": "aws-lc-rs 1.17.3",
"target": "aws_lc_rs"
}
],
Expand Down Expand Up @@ -66785,7 +66779,7 @@
"target": "async_web_client"
},
{
"id": "aws-lc-rs 1.17.1",
"id": "aws-lc-rs 1.17.3",
"target": "aws_lc_rs"
},
{
Expand Down Expand Up @@ -67613,7 +67607,7 @@
"deps": {
"common": [
{
"id": "aws-lc-rs 1.17.1",
"id": "aws-lc-rs 1.17.3",
"target": "aws_lc_rs"
},
{
Expand Down
8 changes: 4 additions & 4 deletions Cargo.Bazel.toml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -874,9 +874,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"

[[package]]
name = "aws-lc-rs"
version = "1.17.1"
version = "1.17.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4342d8937fc7e5dd9b1c60292261c0670c882a2cd1719cfc11b1af41731e32ad"
checksum = "00bdb5da18dac48ca2cc7cd4a98e533e8635a58e2361d13a1a4ee3888e0d72f1"
dependencies = [
"aws-lc-sys",
"untrusted 0.7.1",
Expand All @@ -885,9 +885,9 @@ dependencies = [

[[package]]
name = "aws-lc-sys"
version = "0.42.0"
version = "0.43.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d9ceb1da931507a12f4fccea479dccd00da1943e1b4ae72d8e502d707361444"
checksum = "43103168cc76fe62678a375e722fc9cb3a0146159ac5828bc4f0dfd755c2224c"
dependencies = [
"cc",
"cmake",
Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading