urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-25 13:04:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

uses a separate desk and manual commit for +solid staging (avoids -A)

Browse Source
This commit is contained in:
Joe Bryan 2019-05-15 22:25:19 -07:00
parent e1f39e87e3
commit 4b005f8144
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nix/ops/default.nix
View File

@ -10,6 +10,13 @@ let
bootbrass = ../../bin/brass.pill; bootbrass = ../../bin/brass.pill;
bootsolid = ../../bin/solid.pill; bootsolid = ../../bin/solid.pill;
rawzod = import ./fakeship {
inherit pkgs tlon deps debug;
pill = bootsolid;
ship = "zod";
arvo = null;
};
zod = import ./fakeship { zod = import ./fakeship {
inherit pkgs tlon deps arvo debug; inherit pkgs tlon deps arvo debug;
pill = bootsolid; pill = bootsolid;
@ -33,7 +40,7 @@ rec {
solid = import ./solid { solid = import ./solid {
inherit arvo pkgs tlon deps debug; inherit arvo pkgs tlon deps debug;
pier = zod; pier = rawzod;
}; };
brass = import ./brass { brass = import ./brass {

7
nix/ops/fakeship/builder.sh
View File

@ -2,7 +2,12 @@ source $stdenv/setup
set -ex 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 () { check () {
[ 3 -eq "$(herb $out -d 3)" ] [ 3 -eq "$(herb $out -d 3)" ]

10
nix/ops/solid/builder.sh
View File

@ -15,7 +15,15 @@ cleanup () {
trap cleanup EXIT 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 mv solid.pill $out