From c092f9cea4ae6528a2144ebfed6529126942fd26 Mon Sep 17 00:00:00 2001 From: Philip Monk Date: Wed, 13 May 2020 14:13:26 -0700 Subject: [PATCH] hood: remove references to ford --- bin/solid.pill | 4 +- pkg/arvo/gen/hood/keep-ford.hoon | 13 ---- pkg/arvo/gen/hood/wipe-ford.hoon | 14 ---- pkg/arvo/lib/hood/kiln.hoon | 10 --- pkg/arvo/lib/strandio.hoon | 109 ------------------------------- 5 files changed, 2 insertions(+), 148 deletions(-) delete mode 100644 pkg/arvo/gen/hood/keep-ford.hoon delete mode 100644 pkg/arvo/gen/hood/wipe-ford.hoon diff --git a/bin/solid.pill b/bin/solid.pill index 4c96213937..f6ab9b6ec1 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3cc5752c31acbb4bb1dd9e4c915eb8d125a2a01f1bbc1c72e6e0ec2cf73975b -size 12444927 +oid sha256:2c2de07be164de8a840cc724294a0b6770a9fb7b9cd28026ada3ea4a9a18cbd2 +size 13198099 diff --git a/pkg/arvo/gen/hood/keep-ford.hoon b/pkg/arvo/gen/hood/keep-ford.hoon deleted file mode 100644 index 30bac8cdf5..0000000000 --- a/pkg/arvo/gen/hood/keep-ford.hoon +++ /dev/null @@ -1,13 +0,0 @@ -:: Kiln: resize Ford cache -:: -:::: - :: -/? 310 -:: -:::: - !: -:- %say -|= $: [now=@da eny=@uvJ bec=beak] - [[compiler-cache-size=@ud build-cache-size=@ud ~] ~] - == -[%kiln-keep-ford compiler-cache-size build-cache-size] diff --git a/pkg/arvo/gen/hood/wipe-ford.hoon b/pkg/arvo/gen/hood/wipe-ford.hoon deleted file mode 100644 index 4261e871b7..0000000000 --- a/pkg/arvo/gen/hood/wipe-ford.hoon +++ /dev/null @@ -1,14 +0,0 @@ -:: Kiln: wipe ford cache -:: -:::: /hoon/wipe-ford/hood/gen - :: -/? 310 -:: -:::: - !: -:- %say -|= $: [now=@da eny=@uvJ bec=beak] - [percent=@ud ~] - ~ - == -[%kiln-wipe-ford percent] diff --git a/pkg/arvo/lib/hood/kiln.hoon b/pkg/arvo/lib/hood/kiln.hoon index bed6538bc7..988e65880e 100644 --- a/pkg/arvo/lib/hood/kiln.hoon +++ b/pkg/arvo/lib/hood/kiln.hoon @@ -206,8 +206,6 @@ %kiln-track =;(f (f !<(_+<.f vase)) poke-track) %kiln-sync =;(f (f !<(_+<.f vase)) poke-sync) %kiln-syncs =;(f (f !<(_+<.f vase)) poke-syncs) - %kiln-wipe-ford =;(f (f !<(_+<.f vase)) poke-wipe-ford) - %kiln-keep-ford =;(f (f !<(_+<.f vase)) poke-keep-ford) %kiln-autoload =;(f (f !<(_+<.f vase)) poke-autoload) %kiln-overload =;(f (f !<(_+<.f vase)) poke-overload) %kiln-goad-gall =;(f (f !<(_+<.f vase)) poke-goad-gall) @@ -301,14 +299,6 @@ ?> (gte start now) abet:(emit %pass /kiln/overload/(scot %dr recur) %arvo %b [%wait start]) :: -++ poke-wipe-ford - |=(percent=@ud abet:(emit %pass /kiln %arvo %f [%wipe percent])) -:: -++ poke-keep-ford - |= [compiler-cache-size=@ud build-cache-size=@ud] - =< abet - (emit %pass /kiln %arvo %f [%keep compiler-cache-size build-cache-size]) -:: ++ poke-goad-gall |= [force=? agent=(unit dude:gall)] abet:(emit %pass /kiln %arvo %g %goad force agent) diff --git a/pkg/arvo/lib/strandio.hoon b/pkg/arvo/lib/strandio.hoon index 60f123214d..8a645f1538 100644 --- a/pkg/arvo/lib/strandio.hoon +++ b/pkg/arvo/lib/strandio.hoon @@ -386,31 +386,6 @@ ;< ~ bind:m (send-request (hiss-to-request:html hiss)) take-maybe-sigh :: -:: Run ford build -:: -++ ford-build - |= =schematic:ford - =/ m (strand ,build-result:ford) - ^- form:m - ;< ~ bind:m (send-raw-card %pass /ford-build %arvo %f %build | schematic) - ;< =made-result:ford bind:m (take-made-result /ford-build) - ?: ?=(%incomplete -.made-result) - (strand-fail %ford-incomplete tang.made-result) - (pure:m build-result.made-result) -:: Take ford build result -:: -++ take-made-result - |= =wire - =/ m (strand ,made-result:ford) - ^- form:m - |= tin=strand-input:strand - ?+ in.tin `[%skip ~] - ~ `[%wait ~] - [~ %sign * %f %made *] - ?. =(wire wire.u.in.tin) - `[%skip ~] - `[%done result.sign-arvo.u.in.tin] - == :: +build-fail: build the source file at the specified $beam :: ++ build-file @@ -450,90 +425,6 @@ (strand-fail %build-cast >arg< ~) ?> =(%tube p.r.u.riot) (pure:m !<(tube:clay q.r.u.riot)) -:: Run several taggged ford builds -:: -++ build-map - |= builds=(map path schematic:ford) - =/ m (strand ,(map path build-result:ford)) - ^- form:m - =/ schematics=(list schematic:ford) - %+ turn ~(tap by builds) - |= [=path =schematic:ford] - [[%$ %noun !>(path)] schematic] - :: - ;< =build-result:ford bind:m (ford-build %list schematics) - ?: ?=(%error -.build-result) - (strand-fail %ford-error message.build-result) - ?> ?=(%list -.+.build-result) - :: - =| produce=(map path build-result:ford) - |- ^- form:m - =* loop $ - ?^ results.build-result - ?> ?=([[%success %$ %noun *] *] +.i.results.build-result) - =. produce - %+ ~(put by produce) - !<(path q.cage.head.i.results.build-result) - tail.i.results.build-result - loop(results.build-result t.results.build-result) - (pure:m produce) -:: -:: Run several taggged ford builds -:: -++ build-cages - |= builds=(map path schematic:ford) - =/ m (strand ,(map path cage)) - ^- form:m - ;< result-map=(map path build-result:ford) bind:m (build-map builds) - =/ results=(list [=path =build-result:ford]) ~(tap by result-map) - =| produce=(map path cage) - |- ^- form:m - =* loop $ - ?^ results - ?: ?=(%error -.build-result.i.results) - (strand-fail %ford-error message.build-result.i.results) - =. produce - %+ ~(put by produce) path.i.results - (result-to-cage:ford build-result.i.results) - loop(results t.results) - (pure:m produce) -:: -:: Run ford %core build -:: -++ build-core - |= =rail:ford - =/ m (strand ,vase) - ^- form:m - ;< =build-result:ford bind:m (ford-build %core rail) - ?: ?=(%error -.build-result) - (strand-fail %ford-error message.build-result) - ?> ?=(%core -.+.build-result) - (pure:m vase.build-result) -:: -:: Run ford %core builds -:: -++ build-cores - |= rails=(map path rail:ford) - =/ m (strand ,(map path vase)) - ^- form:m - =/ builds - %- ~(run by rails) - |= =rail:ford - [%core rail] - :: - ;< result-map=(map path build-result:ford) bind:m (build-map builds) - =/ results=(list [=path =build-result:ford]) ~(tap by result-map) - =| produce=(map path vase) - |- ^- form:m - =* loop $ - ?^ results - ?: ?=(%error -.build-result.i.results) - (strand-fail %ford-error message.build-result.i.results) - ?> ?=(%core -.+.build-result.i.results) - =. produce - (~(put by produce) path.i.results vase.build-result.i.results) - loop(results t.results) - (pure:m produce) :: :: Read from Clay ::