Skip to content

Commit

Permalink
Bump toolchains
Browse files Browse the repository at this point in the history
- Bump most Bazel modules
- Update Bazel 7.2.1 -> 7.3.1
- Use correct llvm bintools
- Bump flake and fix toolchain issues
- Regenerate LRE toolchains
- Adjust web deps (notably playwright)
- Fix deprecated go linter
- Fix out-of-sync nativelink version
- Update Rust 1.79.0 -> 1.81.0
  • Loading branch information
aaronmondal committed Sep 24, 2024
1 parent f31015d commit 3aa0648
Show file tree
Hide file tree
Showing 26 changed files with 2,809 additions and 3,273 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.2.1
7.3.1
1 change: 1 addition & 0 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ linters:
# Deprecated.
- execinquery
- gomnd
- exportloopref

# Allow all packages for now.
- depguard
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ resolver = "2"

[package]
name = "nativelink"
version = "0.5.1"
version = "0.5.3"
edition = "2021"
rust-version = "1.79.0"
rust-version = "1.81.0"

[profile.release]
lto = true
Expand Down
14 changes: 7 additions & 7 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module(

bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "rules_python", version = "0.34.0")
bazel_dep(name = "rules_python", version = "0.36.0")

python = use_extension("@rules_python//python/extensions:python.bzl", "python")
python.toolchain(
Expand All @@ -18,7 +18,7 @@ python.toolchain(
)
use_repo(python, python = "python_versions")

bazel_dep(name = "rules_rust", version = "0.48.0")
bazel_dep(name = "rules_rust", version = "0.51.0")

rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
rust.toolchain(
Expand Down Expand Up @@ -46,7 +46,7 @@ rust.toolchain(
"2024-07-24/rust-std-nightly-aarch64-apple-darwin.tar.xz": "ea8afa34a2010b7ed371ad260af837cf89d02fb24783ed9cee75685781247fde",
},
versions = [
"1.79.0",
"1.81.0",
"nightly/2024-07-24",
],
)
Expand All @@ -57,7 +57,7 @@ rust_host_tools = use_extension(
)
rust_host_tools.host_tools(
edition = "2021",
version = "1.79.0",
version = "1.81.0",
)

use_repo(rust, "rust_toolchains")
Expand Down Expand Up @@ -85,13 +85,13 @@ rust_analyzer = use_extension(
)
rust_analyzer.rust_analyzer_dependencies()

bazel_dep(name = "protobuf", version = "27.2", repo_name = "com_google_protobuf")
bazel_dep(name = "toolchains_protoc", version = "0.3.1")
bazel_dep(name = "protobuf", version = "27.5", repo_name = "com_google_protobuf")
bazel_dep(name = "toolchains_protoc", version = "0.3.3")

protoc = use_extension("@toolchains_protoc//protoc:extensions.bzl", "protoc")
protoc.toolchain(
google_protobuf = "com_google_protobuf",
version = "v27.1",
version = "v28.0",
)

# Local remote execution.
Expand Down
49 changes: 22 additions & 27 deletions flake.lock

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

7 changes: 1 addition & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
};
crane = {
url = "github:ipetkov/crane";
inputs.nixpkgs.follows = "nixpkgs";
};
nix2container = {
url = "github:nlewo/nix2container";
Expand Down Expand Up @@ -49,7 +48,7 @@
system,
...
}: let
stable-rust-version = "1.79.0";
stable-rust-version = "1.81.0";
nightly-rust-version = "2024-07-24";

# TODO(aaronmondal): Make musl builds work on Darwin.
Expand Down Expand Up @@ -338,11 +337,7 @@
name = "nixpkgs-patched";
src = self.inputs.nixpkgs;
patches = [
./tools/nixpkgs_all-packages.diff
./tools/nixpkgs_link_libunwind_and_libcxx.diff
./tools/nixpkgs_disable_ratehammering_pulumi_tests.diff
./tools/nixpkgs_bun.diff
./tools/nixpkgs_playwright_driver.diff
];
};
in
Expand Down
28 changes: 14 additions & 14 deletions local-remote-execution/generated-cc/cc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,18 @@ cc_toolchain_config(
coverage_link_flags = ["--coverage"],
cpu = "k8",
cxx_builtin_include_directories = [
"/nix/store/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/resource-root/include",
"/nix/store/09lv9r3dx6ql0lzpdv8w2b1r6b358481-glibc-2.39-52-dev/include",
"/nix/store/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/resource-root/share",
"/nix/store/kacxs7yfq39sl3sqf3gzksipqhyg3gcp-libcxx-18.1.8-dev/include/c++/v1",
"/nix/store/k60snilqpm9cys8h55hib7yzwa0xcxgn-clang-wrapper-18.1.8/resource-root/include",
"/nix/store/wlavaybjbzgllhq11lib6qgr7rm8imgp-glibc-2.39-52-dev/include",
"/nix/store/k60snilqpm9cys8h55hib7yzwa0xcxgn-clang-wrapper-18.1.8/resource-root/share",
"/nix/store/lgy959d2i3psg6a85pv2vx4bwmva4m0r-libcxx-18.1.8-dev/include/c++/v1",
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk",
],
cxx_flags = ["-std=c++14"],
dbg_compile_flags = ["-g"],
host_system_name = "x86_64-unknown-linux-gnu",
link_flags = [
"-fuse-ld=/nix/store/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/bin/ld.mold",
"-B/nix/store/wcjlw1vhvpb8rzri8dqapfldv14lvzvk-customClang/bin",
"-fuse-ld=/nix/store/p05cf5z3nycmxkq14jfp5vl23v46aidy-llvm-binutils-wrapper-18.1.8/bin/ld.mold",
"-B/nix/store/pk06lmp6wwn35xmvn9d7fr78qg6k9qxw-customClang/bin",
"-Wl,-no-as-needed",
"-Wl,-z,relro,-z,now",
],
Expand All @@ -147,18 +147,18 @@ cc_toolchain_config(
target_libc = "glibc_2.35",
target_system_name = "local",
tool_paths = {
"ar": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/ar",
"ld": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/ld",
"ar": "/nix/store/p05cf5z3nycmxkq14jfp5vl23v46aidy-llvm-binutils-wrapper-18.1.8/bin/ar",
"ld": "/nix/store/p05cf5z3nycmxkq14jfp5vl23v46aidy-llvm-binutils-wrapper-18.1.8/bin/ld",
"llvm-cov": "None",
"llvm-profdata": "None",
"cpp": "/usr/bin/cpp",
"gcc": "/nix/store/wcjlw1vhvpb8rzri8dqapfldv14lvzvk-customClang/bin/customClang",
"dwp": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/dwp",
"gcc": "/nix/store/pk06lmp6wwn35xmvn9d7fr78qg6k9qxw-customClang/bin/customClang",
"dwp": "/nix/store/p05cf5z3nycmxkq14jfp5vl23v46aidy-llvm-binutils-wrapper-18.1.8/bin/dwp",
"gcov": "None",
"nm": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/nm",
"objcopy": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/objcopy",
"objdump": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/objdump",
"strip": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/strip",
"nm": "/nix/store/p05cf5z3nycmxkq14jfp5vl23v46aidy-llvm-binutils-wrapper-18.1.8/bin/nm",
"objcopy": "/nix/store/p05cf5z3nycmxkq14jfp5vl23v46aidy-llvm-binutils-wrapper-18.1.8/bin/objcopy",
"objdump": "/nix/store/p05cf5z3nycmxkq14jfp5vl23v46aidy-llvm-binutils-wrapper-18.1.8/bin/objdump",
"strip": "/usr/bin/strip",
},
toolchain_identifier = "local",
unfiltered_compile_flags = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
This file is generated by cc_configure and contains builtin include directories
that /nix/store/wcjlw1vhvpb8rzri8dqapfldv14lvzvk-customClang/bin/customClang reported. This file is a dependency of every compilation action and
that /nix/store/pk06lmp6wwn35xmvn9d7fr78qg6k9qxw-customClang/bin/customClang reported. This file is a dependency of every compilation action and
changes to it will be reflected in the action cache key. When some of these
paths change, Bazel will make sure to rerun the action, even though none of
declared action inputs or the action commandline changes.

/nix/store/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/resource-root/include
/nix/store/09lv9r3dx6ql0lzpdv8w2b1r6b358481-glibc-2.39-52-dev/include
/nix/store/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/resource-root/share
/nix/store/kacxs7yfq39sl3sqf3gzksipqhyg3gcp-libcxx-18.1.8-dev/include/c++/v1
/nix/store/k60snilqpm9cys8h55hib7yzwa0xcxgn-clang-wrapper-18.1.8/resource-root/include
/nix/store/wlavaybjbzgllhq11lib6qgr7rm8imgp-glibc-2.39-52-dev/include
/nix/store/k60snilqpm9cys8h55hib7yzwa0xcxgn-clang-wrapper-18.1.8/resource-root/share
/nix/store/lgy959d2i3psg6a85pv2vx4bwmva4m0r-libcxx-18.1.8-dev/include/c++/v1
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
4 changes: 2 additions & 2 deletions local-remote-execution/generated-cc/cc/cc_wrapper.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/nix/store/f6m3rfxfrv73a5g9kz0gpcsj9qb0905a-bash/bin/bash
#!/nix/store/832dnfv9ffw5744ncjfcn7z9y85450sn-bash/bin/bash
#
# Copyright 2015 The Bazel Authors. All rights reserved.
#
Expand All @@ -22,4 +22,4 @@ set -eu


# Call the C++ compiler
/nix/store/wcjlw1vhvpb8rzri8dqapfldv14lvzvk-customClang/bin/customClang "$@"
/nix/store/pk06lmp6wwn35xmvn9d7fr78qg6k9qxw-customClang/bin/customClang "$@"
Loading

0 comments on commit 3aa0648

Please sign in to comment.