Migrate to hermetic llvm#2312
Merged
MarcusSorealheis merged 4 commits intoTraceMachina:mainfrom May 8, 2026
Merged
Conversation
382cbdc to
ecb12b2
Compare
ecb12b2 to
a38744d
Compare
dzbarsky
reviewed
May 8, 2026
| # repo at the module level. | ||
| # | ||
| # The local musl-platforms patch is still applied because the hermeticbuild | ||
| # fork does not list x86_64/aarch64-unknown-linux-musl as supported triples in |
There was a problem hiding this comment.
really? it's right here https://github.com/hermeticbuild/rules_rs/blob/b332517e256e8c8aeed594f40fcb55bca8303de4/rs/platforms/triples.bzl#L52
i should delete rust/platform/triple_mappings.bzl from the rules_rust fork; it's unused and seems to be causing confusion :)
dzbarsky
approved these changes
May 8, 2026
palfrey
approved these changes
May 8, 2026
Member
palfrey
reviewed
May 8, 2026
| # Rust | ||
| # Rust — see the parent MODULE.bazel for the archive_override that pins | ||
| # rules_rust to the hermeticbuild fork. | ||
| bazel_dep(name = "rules_rust", version = "0.68.1") |
Member
There was a problem hiding this comment.
Can we drop this in favour of rules_rs?
Collaborator
Author
There was a problem hiding this comment.
Yes 😁 I just wanted permission. Thank you.
Collaborator
Author
There was a problem hiding this comment.
this actually led to a number of wackamoles of platform constraints. i'm tracking them down and reformatting.
a38744d to
aeabc36
Compare
aeabc36 to
da90f0a
Compare
da90f0a to
f16fbd1
Compare
amankrx
added a commit
to amankrx/nativelink
that referenced
this pull request
May 9, 2026
Brings in upstream changes since the last sync, including: - feb6a15 Bound CAS leader-wait + per-blob batch deadline (TraceMachina#2298) - 43ab01d Add expiry to completed redis actions (TraceMachina#2315) - 6cdcf8e fix RBE CI for hermetic LLVM (TraceMachina#2314) - f5846df Migrate to hermetic llvm (TraceMachina#2312) Conflicts resolved (all kept the local superset where the local change extended an upstream one): - nativelink-store/src/fast_slow_store.rs: kept HEAD's `huge_blob_dedup_bypasses` / `fast_store_stale_map_falls_through` metrics and the `DEFAULT_BYPASS_DEDUP_THRESHOLD_BYTES` const alongside upstream's `LEADER_WAIT_TIMEOUT` / `leader_wait_timeouts` - nativelink-store/src/filesystem_store.rs: kept HEAD's path_type=Temp bookkeeping inside the ENOENT branch on top of upstream's debug-demote of the rename failure - nativelink-store/src/redis_store.rs: kept HEAD's 4s PING_TIMEOUT and richer doc comment - nativelink-store/tests/{fast_slow_store_test,redis_store_test}.rs: concatenated both branches' independent test additions; merged `use` lists; updated `test_search_by_index_skips_int_from_cursor_read` to expect the local FT.AGGREGATE TIMEOUT clause; added `bypass_dedup_threshold_bytes: 0` to upstream's new FastSlowSpec literal so it satisfies the field added locally. All 30 test binaries across nativelink-store and nativelink-util pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Provide an Bazel-native alternative path to Nix managed toolchains
Type of change
Please delete options that aren't relevant.
not work as expected)
How Has This Been Tested?
Please also list any relevant details for your test configuration
Checklist
bazel test //...passes locallygit amendsee some docsThis change is