luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8099 from eed3si9n/wip/cache-fix 

[2.x] fix: Fix action cache
This commit is contained in:
eugene yokota 2025-04-28 03:48:44 -04:00 committed by GitHub
parent 187eb0f584 537359eb9b
commit 61b0f37375
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util-cache/src/main/scala/sbt/util/ActionCache.scala
View File

@ -64,7 +64,7 @@ object ActionCache:
result
else
cacheEventLog.append(ActionCacheEvent.OnsiteTask)
val (input, valuePath) = mkInput(key, codeContentHash, extraHash, config)
val (input, valuePath) = mkInput(key, codeContentHash, extraHash)
val valueFile = StringVirtualFile1(valuePath, CompactPrinter(json))
val newOutputs = Vector(valueFile) ++ outputs.toVector
store.put(UpdateActionResultRequest(input, newOutputs, exitCode = 0)) match
@ -126,7 +126,8 @@ object ActionCache:
extraHash: Digest,
config: BuildWideCacheConfiguration,
): Either[Throwable, ActionResult] =
val (input, valuePath) = mkInput(key, codeContentHash, extraHash, config)
// val logger = config.logger
val (input, valuePath) = mkInput(key, codeContentHash, extraHash)
val getRequest =
GetActionResultRequest(input, inlineStdout = false, inlineStderr = false, Vector(valuePath))
config.store.get(getRequest)
@ -134,12 +135,11 @@ object ActionCache:
private inline def mkInput[I: HashWriter](
key: I,
codeContentHash: Digest,
extraHash: Digest,
config: BuildWideCacheConfiguration
extraHash: Digest
): (Digest, String) =
val input =
Digest.sha256Hash(codeContentHash, extraHash, Digest.dummy(Hasher.hashUnsafe[I](key)))
(input, s"${config.outputDirectory}/value/$input.json")
(input, s"$${OUT}/value/$input.json")
def manifestFromFile(manifest: Path): Manifest =
import sbt.internal.util.codec.ManifestCodec.given