mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-01 03:23:09 +03:00
uses a separate desk and manual commit for +solid staging (avoids -A)
This commit is contained in:
parent
e1f39e87e3
commit
4b005f8144
@ -10,6 +10,13 @@ let
|
||||
bootbrass = ../../bin/brass.pill;
|
||||
bootsolid = ../../bin/solid.pill;
|
||||
|
||||
rawzod = import ./fakeship {
|
||||
inherit pkgs tlon deps debug;
|
||||
pill = bootsolid;
|
||||
ship = "zod";
|
||||
arvo = null;
|
||||
};
|
||||
|
||||
zod = import ./fakeship {
|
||||
inherit pkgs tlon deps arvo debug;
|
||||
pill = bootsolid;
|
||||
@ -33,7 +40,7 @@ rec {
|
||||
|
||||
solid = import ./solid {
|
||||
inherit arvo pkgs tlon deps debug;
|
||||
pier = zod;
|
||||
pier = rawzod;
|
||||
};
|
||||
|
||||
brass = import ./brass {
|
||||
|
@ -2,7 +2,12 @@ source $stdenv/setup
|
||||
|
||||
set -ex
|
||||
|
||||
$URBIT -d -F $SHIP -A "$ARVO" -B "$PILL" $out
|
||||
if [ -z "$ARVO" ]
|
||||
then
|
||||
$URBIT -d -F $SHIP -B "$PILL" $out
|
||||
else
|
||||
$URBIT -d -F $SHIP -A "$ARVO" -B "$PILL" $out
|
||||
fi
|
||||
|
||||
check () {
|
||||
[ 3 -eq "$(herb $out -d 3)" ]
|
||||
|
@ -15,7 +15,15 @@ cleanup () {
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
herb ./pier -P solid.pill -d '+solid, =dub &'
|
||||
herb ./pier -p hood -d '+hood/merge %stage our %home'
|
||||
herb ./pier -p hood -d "+hood/mount /=stage="
|
||||
|
||||
rm -r ./pier/stage
|
||||
cp -r $ARVO ./pier/stage
|
||||
|
||||
herb ./pier -p hood -d "+hood/commit %stage"
|
||||
|
||||
herb ./pier -P solid.pill -d '+solid /=stage=/sys, =dub &'
|
||||
|
||||
mv solid.pill $out
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user