Commit 2663eb89 authored by Matt Mastracci's avatar Matt Mastracci

Include Dockerfile hash in native binary cache key

A Dockerfile change (e.g. new toolchain, updated SDK) can produce
different binaries. Include its hash in the cache key so stale
binaries aren't restored after Dockerfile changes.
parent 3b86e796
...@@ -31,6 +31,7 @@ const { values: flags } = parseArgs({ ...@@ -31,6 +31,7 @@ const { values: flags } = parseArgs({
const REPO_ROOT = path.resolve(__dirname, '..') const REPO_ROOT = path.resolve(__dirname, '..')
const NATIVE_DIR = path.join(REPO_ROOT, 'packages/next-swc/native') const NATIVE_DIR = path.join(REPO_ROOT, 'packages/next-swc/native')
const FINGERPRINT = path.join(REPO_ROOT, 'target/.rust-fingerprint') const FINGERPRINT = path.join(REPO_ROOT, 'target/.rust-fingerprint')
const DOCKERFILE = path.join(REPO_ROOT, 'scripts/native-builder.Dockerfile')
function computeCacheKey() { function computeCacheKey() {
if (!fs.existsSync(FINGERPRINT)) { if (!fs.existsSync(FINGERPRINT)) {
...@@ -40,13 +41,18 @@ function computeCacheKey() { ...@@ -40,13 +41,18 @@ function computeCacheKey() {
process.exit(1) process.exit(1)
} }
const turboHash = fs.readFileSync(FINGERPRINT, 'utf-8').trim() const turboHash = fs.readFileSync(FINGERPRINT, 'utf-8').trim()
// Combine turbo's input hash with the target triple for a unique key. const dockerfileHash = fs.existsSync(DOCKERFILE)
// Must be hex-only (turbo cache API requirement). ? createHash('sha256')
.update(fs.readFileSync(DOCKERFILE))
.digest('hex')
.slice(0, 16)
: ''
const hash = createHash('sha256') const hash = createHash('sha256')
hash.update(`native-cache-v2\0`) hash.update(`native-cache-v3\0`)
hash.update(`turbo=${turboHash}\0`) hash.update(`turbo=${turboHash}\0`)
hash.update(`target=${flags.target}\0`) hash.update(`target=${flags.target}\0`)
hash.update(`profile=${flags.profile}\0`) hash.update(`profile=${flags.profile}\0`)
hash.update(`dockerfile=${dockerfileHash}\0`)
return hash.digest('hex') return hash.digest('hex')
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment