simon/jolt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

deps: make the .cpcache key stable and keep git fetch off stdout

Browse source 
The cache key was built with janet's (hash ...), which is seeded per
process, so it never matched across invocations and every jolt-deps run
re-resolved and re-fetched. Store the raw key material instead.

Run the jpm git calls silenced (:silent) with a one-line progress note
on stderr — the checkout chatter ("HEAD is now at ...") was landing on
stdout and corrupting the documented JOLT_PATH=$(jolt-deps path) capture.

Covered by two new deps-resolve checks: a cross-process cache-hit probe
(sentinel-tampered cache file) and a stdout-cleanliness check against a
local file:// git dep.
This commit is contained in:
Yogthos 2026-06-11 01:31:37 -04:00
parent 9cb3369f50
commit c2511fee7e
2 changed files with 87 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/jolt/deps.janet
View file

@ -30,11 +30,17 @@
# spec is a deps.edn dep value: {:git/url ... :git/sha/:git/tag ...}
(def resolve-bundle (jpm-fn "jpm/pm" 'resolve-bundle))
(def download-bundle (jpm-fn "jpm/pm" 'download-bundle))
(def b (resolve-bundle {:url (get spec :git/url)
:sha (get spec :git/sha)
:tag (get spec :git/tag)
:shallow false}))
(download-bundle (b :url) (b :type) (b :tag) (b :shallow)))
# Run git silenced (jpm's shell honors :silent): its checkout chatter
# ("HEAD is now at …") otherwise lands on STDOUT and corrupts the
# documented `JOLT_PATH=$(jolt-deps path)` capture. Progress goes to stderr.
(eprintf "jolt-deps: fetching %s @ %s"
(get spec :git/url) (or (get spec :git/sha) (get spec :git/tag) "HEAD"))
(with-dyns [:silent true]
(def b (resolve-bundle {:url (get spec :git/url)
:sha (get spec :git/sha)
:tag (get spec :git/tag)
:shallow false}))
(download-bundle (b :url) (b :type) (b :tag) (b :shallow))))
(defn- src-roots
"Source dirs of a project/dep at `dir`: its deps.edn :paths joined to dir
@ -210,14 +216,16 @@
(os/mkdir ".cpcache")
(def cache-file ".cpcache/jolt-deps.jdn")
(def user-path (string (config-dir) "/deps.edn"))
(def h (hash [(slurp deps-edn-path)
(when (os/stat user-path) (slurp user-path))
(string/format "%j" (map string (or aliases [])))]))
# The raw key material, not (hash …): janet's hash is seeded per process,
# so a hashed key never matches across invocations and the cache never hit.
(def key [(slurp deps-edn-path)
(or (when (os/stat user-path) (slurp user-path)) "")
(string/format "%j" (map string (or aliases [])))])
(def cached (when (os/stat cache-file) (try (parse (slurp cache-file)) ([_] nil))))
(if (and cached (= h (get cached :hash)))
(if (and cached (deep= key (get cached :key)))
(get cached :roots)
(let [roots (resolve-deps deps-edn-path tree aliases)]
(spit cache-file (string/format "%j" {:hash h :roots roots}))
(spit cache-file (string/format "%j" {:key key :roots roots}))
roots))))
# --- :tasks (the honest subset of babashka's) ----------------------------------