fix(scripts): include build inputs in make_git_package cache key - #145
Merged
alexhulbert merged 2 commits intoJul 27, 2026
Merged
Conversation
…s#24) Fixes flashbots#144 The cache key was `<package>-<git_describe>` — source identity only. Build-input changes (RUSTFLAGS, GOFLAGS, cargo profile env vars, toolchain version) silently reused cached binaries built under different conditions. Cache key is now `<package>-<git_describe>-<env_hash>`, where env_hash is `sha256(build_cmd || $MAKE_GIT_PACKAGE_CACHE_KEY_EXTRA)`. build_cmd is always hashed in. MAKE_GIT_PACKAGE_CACHE_KEY_EXTRA is opt-in for caller-injected inputs — e.g., the rust toolchain version installed via rustup, so that toolchain bumps invalidate cached binaries built under the previous one. Existing caches invalidate once when this lands.
ameba23
approved these changes
Jul 27, 2026
ameba23
left a comment
ameba23
left a comment
Contributor
There was a problem hiding this comment.
💯 Great fix.
But worth noting this does not [yet] actually fix the issue for the callers of make_git_package in this repo - only external ones which explicitly set MAKE_GIT_PACKAGE_CACHE_KEY_EXTRA.
So as a followup we could set eg:
MAKE_GIT_PACKAGE_CACHE_KEY_EXTRA="rust_version=$RUST_VERSION"
in these files:
modules/l2/simulator/mkosi.buildmodules/l2/op-rbuilder/mkosi.buildmodules/l2/op-rbuilder-bproxy/mkosi.build
Co-authored-by: peg <ameba23@systemli.org>
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
3 participants
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.
Fixes #144.
The cache key was
<package>-<git_describe>— source identity only. Build-input changes (RUSTFLAGS, GOFLAGS, cargo profile env vars, toolchain version) silently reused cached binaries built under different conditions.Cache key is now
<package>-<git_describe>-<env_hash>, where env_hash issha256(build_cmd || $MAKE_GIT_PACKAGE_CACHE_KEY_EXTRA). build_cmd is always hashed in. MAKE_GIT_PACKAGE_CACHE_KEY_EXTRA is opt-in for caller-injected inputs — e.g., the rust toolchain version installed via rustup, so that toolchain bumps invalidate cached binaries built under the previous one.Existing caches invalidate once when this lands.