Skip to content

Commit 29cb3d7

Browse files
dkostyrevdkostyrev
authored
Merge branch 'main' into feature/balanced-channel
2 parents 6406230 + 86b86e1 commit 29cb3d7

File tree

33 files changed

+625
-69
lines changed

33 files changed

+625
-69
lines changed

‎.github/workflows/native-cargo.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,6 @@ jobs:
5050

5151
- name: Test on ${{ runner.os }}
5252
run: cargo test --all --profile=smol
53+
54+
- name: Check schema export
55+
run: cargo run --bin build-schema --features dev-schema --package nativelink-config

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ darwin.bazelrc
2424
nativelink.bazelrc
2525
*.log
2626
buck-out/
27+
nativelink_config.schema.json

‎Cargo.lock‎

Lines changed: 31 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MODULE.bazel‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ rust.toolchain(
7979
rust_analyzer_version = "nightly/2025-05-21",
8080
rustfmt_version = "nightly/2025-05-21",
8181
sha256s = {
82+
# Update the shas with update-module-hashes
83+
# BEGIN SHAS
8284
"2025-05-21/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "e866f249dfbdf10a68b7191c025257591e8a5aa2fede1663b34c88a4f4bb8a74",
8385
"2025-05-21/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "0a312d722a94e3b9e1f7871d9a9af01d410917c2406dbf91d014c06fe79540fb",
8486
"2025-05-21/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "eee28e99ac24c27f3de969915e808c0645ee099b136e5547681110607d09d050",
@@ -97,6 +99,7 @@ rust.toolchain(
9799
"rust-std-1.87.0-x86_64-unknown-linux-gnu.tar.xz": "1b57253bd32b8b292c965b3a2d992a266763158494cab8555584c09360b90f77",
98100
"rustc-1.87.0-aarch64-apple-darwin.tar.xz": "175800bc89cccd8f8ee2f3a4d07bdf98c163030fd5d3dc6d5b23cf4dd0a2a4c3",
99101
"rustc-1.87.0-x86_64-unknown-linux-gnu.tar.xz": "e8395c5c5756253b76107055e093ffbc4431af7b30aeebe72ce2684b9cb53973",
102+
# END SHAS
100103
},
101104
versions = [
102105
"1.87.0",

‎deployment-examples/docker-compose/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ COPY --from=builder /root/nativelink-bin /usr/local/bin/nativelink
5959
ARG ADDITIONAL_SETUP_WORKER_CMD
6060

6161
RUN apt-get update \
62-
&& apt-get install -y --no-install-recommends curl=8.5.0-2ubuntu10.6 \
62+
&& apt-get install -y --no-install-recommends curl=8.5.0-2ubuntu10.7 \
6363
&& apt-get clean \
6464
&& rm -rf /var/lib/apt/lists/* \
6565
&& bash -ueo pipefail -c "${ADDITIONAL_SETUP_WORKER_CMD}" \

‎deployment-examples/metrics/docker-compose.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ services:
4747

4848
# Grafana for visualization
4949
grafana:
50-
image: grafana/grafana:10.3.0
50+
image: grafana/grafana:12.4.0
5151
container_name: grafana
5252
restart: unless-stopped
5353
ports:

‎flake.nix‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,13 @@
150150
}
151151
// (pkgs.lib.optionalAttrs isLinuxTarget {
152152
CARGO_BUILD_RUSTFLAGS = "-C target-feature=+crt-static";
153+
TARGET_CC = "${pkgs.lre.clang}/bin/customClang";
153154
${linkerEnvVar} = linkerPath;
154155
});
155156

156157
# Additional target for external dependencies to simplify caching.
157158
cargoArtifactsFor = p: (craneLibFor p).buildDepsOnly (commonArgsFor p);
158-
nightlyCargoArtifactsFor = p: (craneLibFor p).buildDepsOnly (commonArgsFor p);
159+
nightlyCargoArtifactsFor = p: (nightlyCraneLibFor p).buildDepsOnly (commonArgsFor p);
159160

160161
nativelinkFor = p:
161162
(craneLibFor p).buildPackage ((commonArgsFor p)
@@ -291,16 +292,7 @@
291292

292293
nativelinkCoverageFor = p: let
293294
coverageArgs =
294-
(commonArgsFor p)
295-
// {
296-
# TODO(palfrey): For some reason we're triggering an edgecase where
297-
# mimalloc builds against glibc headers in coverage
298-
# builds. This leads to nonexistend __memcpy_chk and
299-
# __memset_chk symbols if fortification is enabled.
300-
# Our regular builds also have this issue, but we
301-
# should investigate further.
302-
hardeningDisable = ["fortify"];
303-
};
295+
commonArgsFor p;
304296
in
305297
(nightlyCraneLibFor p).cargoLlvmCov (coverageArgs
306298
// {
@@ -381,7 +373,12 @@
381373
buck2-with-nativelink-test = pkgs.callPackage integration_tests/buck2/buck2-with-nativelink-test.nix {
382374
inherit nativelink buck2;
383375
};
384-
376+
update-module-hashes = pkgs.callPackage tools/updaters/rewrite-module.nix {
377+
python-with-requests = pkgs.python3.withPackages (ps:
378+
with ps; [
379+
ps.requests
380+
]);
381+
};
385382
generate-bazel-rc = pkgs.callPackage tools/generate-bazel-rc/build.nix {craneLib = craneLibFor pkgs;};
386383
generate-stores-config = pkgs.callPackage nativelink-config/generate-stores-config/build.nix {craneLib = craneLibFor pkgs;};
387384
}
@@ -466,6 +463,7 @@
466463
pkgs.pre-commit
467464
pkgs.git-cliff
468465
pkgs.buck2
466+
packages.update-module-hashes
469467

470468
# Rust
471469
bazel

‎native-cli/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildGoModule {
99
pname = "native-cli";
1010
version = "0.6.0";
1111
src = ./.;
12-
vendorHash = "sha256-qKUyhXVKsoswRpSmO06h6ROelsaABHLADn58qhKauSY=";
12+
vendorHash = "sha256-dlJrpblQAx0/+DCLJ4xT6whRQo3SmSgRq/dLd0yH440=";
1313
buildInputs = [makeWrapper];
1414
ldflags = ["-s -w"];
1515
installPhase = ''

‎native-cli/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ require (
3636
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
3737
github.com/charmbracelet/x/term v0.2.1 // indirect
3838
github.com/cheggaaa/pb v1.0.29 // indirect
39-
github.com/cloudflare/circl v1.6.1 // indirect
39+
github.com/cloudflare/circl v1.6.3 // indirect
4040
github.com/containerd/log v0.1.0 // indirect
4141
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
4242
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect

‎native-cli/go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQ
4545
github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
4646
github.com/cheggaaa/pb v1.0.29 h1:FckUN5ngEk2LpvuG0fw1GEFx6LtyY2pWI/Z2QgCnEYo=
4747
github.com/cheggaaa/pb v1.0.29/go.mod h1:W40334L7FMC5JKWldsTWbdGjLo0RxUKK73K+TuPxX30=
48-
github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
49-
github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
48+
github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
49+
github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
5050
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
5151
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
5252
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
@@ -94,8 +94,6 @@ github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UN
9494
github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
9595
github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
9696
github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
97-
github.com/go-git/go-git/v5 v5.14.0 h1:/MD3lCrGjCen5WfEAzKg00MJJffKhC8gzS80ycmCi60=
98-
github.com/go-git/go-git/v5 v5.14.0/go.mod h1:Z5Xhoia5PcWA3NF8vRLURn9E5FRhSl7dGj9ItW3Wk5k=
9997
github.com/go-git/go-git/v5 v5.16.5 h1:mdkuqblwr57kVfXri5TTH+nMFLNUxIj9Z7F5ykFbw5s=
10098
github.com/go-git/go-git/v5 v5.16.5/go.mod h1:QOMLpNf1qxuSY4StA/ArOdfFR2TrKEjJiye2kel2m+M=
10199
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=

0 commit comments

Comments
 (0)