mirror of
https://github.com/urbit/shrub.git
synced 2024-12-13 06:25:09 +03:00
Merge pull request #833 from urbit/hashboard-jet-cleanup
hashboard CI staging and minor jet cleanup
This commit is contained in:
commit
bc9936fbec
@ -26,7 +26,7 @@ mkdir prev
|
||||
: Pilling: trying pinned fakezod
|
||||
wget -i pin-parent-pill-pier.url -O - | tar xvz -C prev/ &&
|
||||
: Downloaded prev/zod &&
|
||||
lsc ./in-urbit.ls -FI zod prev/zod <<' .'
|
||||
lsc ./in-urbit.ls -SFI zod prev/zod <<' .'
|
||||
|autoload |
|
||||
|mount %
|
||||
.
|
||||
@ -36,7 +36,8 @@ mkdir prev
|
||||
HASH2=$(git -C .. log -2 $HASH --format=%H -- sys/ | tail -1)
|
||||
PILL_NAME2="git-${HASH2:0:10}"
|
||||
wget https://bootstrap.urbit.org/$PILL_NAME2.pill -O prev/urbit.pill &&
|
||||
lsc ./in-urbit.ls -A .. -B prev/urbit.pill -cFI zod prev/zod <<' .'
|
||||
([ -d prev/zod ] && rm -r prev/zod || true) &&
|
||||
lsc ./in-urbit.ls -A .. -B prev/urbit.pill -cSFI zod prev/zod <<' .'
|
||||
%booted-prev-zod
|
||||
.
|
||||
} || {
|
||||
@ -45,7 +46,7 @@ mkdir prev
|
||||
}
|
||||
|
||||
: Pier created, soliding actual pill
|
||||
lsc ./in-urbit.ls -FI zod prev/zod <<.
|
||||
lsc ./in-urbit.ls -SFI zod prev/zod <<.
|
||||
|label %home %$PILL_NAME
|
||||
.urbit/pill +solid /==/$PILL_NAME/sys, =dub &
|
||||
.
|
||||
|
@ -1 +1 @@
|
||||
https://ci-piers.urbit.org/zod-3602a96fb7c224939f477bc0f94b849fa9c888fb.tgz
|
||||
https://ci-piers.urbit.org/zod-9f28fa396e1f8de8d58e146f7813e6b47952b694.tgz
|
||||
|
@ -1 +1 @@
|
||||
89479463e5a39ef9ede4e5c414ca5c5721520100
|
||||
6fca8527232cfe7ed73bbe70a5a8348ef8f57e0c
|
@ -1,6 +1,6 @@
|
||||
{Urbit,ERROR} = require './runner.ls'
|
||||
|
||||
urbit = new Urbit <[-B urbit.pill -A .. -cFI zod zod]>
|
||||
urbit = new Urbit <[-B urbit.pill -A .. -cSFI zod zod]>
|
||||
Promise.resolve urbit
|
||||
.then (urb)->
|
||||
urb.note "Booting urbit"
|
||||
|
@ -593,6 +593,7 @@
|
||||
?.(=(u.a u.b) ~>(%mean.[%leaf "mate"] !!) a)
|
||||
::
|
||||
++ need :: demand
|
||||
~/ %need
|
||||
|* a/(unit)
|
||||
?~ a ~>(%mean.[%leaf "need"] !!)
|
||||
u.a
|
||||
@ -3217,6 +3218,7 @@
|
||||
(shaf %sham (jam yux))
|
||||
::
|
||||
++ shas :: salted hash
|
||||
~/ %shas
|
||||
|= {sal/@ ruz/@}
|
||||
(shax (mix sal (shax ruz)))
|
||||
::
|
||||
@ -4881,6 +4883,8 @@
|
||||
::
|
||||
++ pfix :: discard first rule
|
||||
~/ %pfix
|
||||
|* sam=*
|
||||
%. sam
|
||||
(comp |*({a/* b/*} b))
|
||||
::
|
||||
++ plug :: first then second
|
||||
@ -4911,6 +4915,8 @@
|
||||
::
|
||||
++ sfix :: discard second rule
|
||||
~/ %sfix
|
||||
|* sam=*
|
||||
%. sam
|
||||
(comp |*({a/* b/*} a))
|
||||
::
|
||||
:::: 4f: parsing (rule builders)
|
||||
|
Loading…
Reference in New Issue
Block a user