From 29cc7e46760e78916b87ba09252f8f654e725807 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 11 Jun 2024 01:22:55 +0000 Subject: [PATCH] flake: add targets to deploy to crappy --- flake.nix | 57 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index de8099e2..219f69fa 100644 --- a/flake.nix +++ b/flake.nix @@ -325,16 +325,19 @@ }; deploy = { - desko = deployApp "desko" "desko" "switch"; - desko-light = deployApp "desko-light" "desko" "switch"; - lappy = deployApp "lappy" "lappy" "switch"; - lappy-light = deployApp "lappy-light" "lappy" "switch"; - lappy-min = deployApp "lappy-min" "lappy" "switch"; - moby = deployApp "moby" "moby" "switch"; - moby-light = deployApp "moby-light" "moby" "switch"; - moby-min = deployApp "moby-min" "moby" "switch"; - moby-test = deployApp "moby" "moby" "test"; - servo = deployApp "servo" "servo" "switch"; + crappy = deployApp "crappy" "crappy" "switch"; + crappy-light = deployApp "crappy-light" "crappy" "switch"; + crappy-min = deployApp "crappy-min" "crappy" "switch"; + desko = deployApp "desko" "desko" "switch"; + desko-light = deployApp "desko-light" "desko" "switch"; + lappy = deployApp "lappy" "lappy" "switch"; + lappy-light = deployApp "lappy-light" "lappy" "switch"; + lappy-min = deployApp "lappy-min" "lappy" "switch"; + moby = deployApp "moby" "moby" "switch"; + moby-light = deployApp "moby-light" "moby" "switch"; + moby-min = deployApp "moby-min" "moby" "switch"; + moby-test = deployApp "moby" "moby" "test"; + servo = deployApp "servo" "servo" "switch"; # like `nixos-rebuild --flake . switch` self = deployApp "$(hostname)" "" "switch"; @@ -347,31 +350,38 @@ nix run '.#deploy.moby' nix run '.#deploy.desko' nix run '.#deploy.servo' + nix run '.#deploy.crappy' ''); }; preDeploy = { # build the host and copy the runtime closure to that host, but don't activate it. - desko = deployApp "desko" "desko" null; - desko-light = deployApp "desko-light" "desko" null; - lappy = deployApp "lappy" "lappy" null; - lappy-light = deployApp "lappy-light" "lappy" null; - lappy-min = deployApp "lappy-min" "lappy" null; - moby = deployApp "moby" "moby" null; - moby-light = deployApp "moby-light" "moby" null; - moby-min = deployApp "moby-min" "moby" null; - servo = deployApp "servo" "servo" null; + crappy = deployApp "crappy" "crappy" null; + crappy-light = deployApp "crappy-light" "crappy" null; + crappy-min = deployApp "crappy-min" "crappy" null; + desko = deployApp "desko" "desko" null; + desko-light = deployApp "desko-light" "desko" null; + lappy = deployApp "lappy" "lappy" null; + lappy-light = deployApp "lappy-light" "lappy" null; + lappy-min = deployApp "lappy-min" "lappy" null; + moby = deployApp "moby" "moby" null; + moby-light = deployApp "moby-light" "moby" null; + moby-min = deployApp "moby-min" "moby" null; + servo = deployApp "servo" "servo" null; type = "app"; program = builtins.toString (pkgs.writeShellScript "predeploy-all" '' # copy the -min/-light variants first; this might be run while waiting on a full build. or the full build failed. nix run '.#preDeploy.moby-min' -- "$@" nix run '.#preDeploy.lappy-min' -- "$@" + nix run '.#preDeploy.crappy-min' -- "$@" nix run '.#preDeploy.moby-light' -- "$@" nix run '.#preDeploy.lappy-light' -- "$@" nix run '.#preDeploy.desko-light' -- "$@" + nix run '.#preDeploy.crappy-light' -- "$@" nix run '.#preDeploy.lappy' -- "$@" nix run '.#preDeploy.servo' -- "$@" nix run '.#preDeploy.moby' -- "$@" nix run '.#preDeploy.desko' -- "$@" + nix run '.#preDeploy.crappy' -- "$@" ''); }; @@ -475,41 +485,48 @@ # this gives me a minimal image i can deploy or copy over, early. ${checkHost "lappy-min"} ${checkHost "moby-min"} + ${checkHost "crappy-min"} ${checkHost "desko-light"} ${checkHost "moby-light"} ${checkHost "lappy-light"} + ${checkHost "crappy-light"} ${checkHost "desko"} ${checkHost "lappy"} ${checkHost "servo"} ${checkHost "moby"} + ${checkHost "crappy"} ${checkHost "rescue"} # still want to build the -light variants first so as to avoid multiple simultaneous webkitgtk builds ${checkHost "desko-light-next"} ${checkHost "moby-light-next"} + ${checkHost "crappy-light-next"} ${checkHost "desko-next"} ${checkHost "lappy-next"} ${checkHost "servo-next"} ${checkHost "moby-next"} + ${checkHost "crappy-next"} ${checkHost "rescue-next"} echo "desko: $RC_desko" echo "lappy: $RC_lappy" echo "servo: $RC_servo" echo "moby: $RC_moby" + echo "crappy: $RC_crappy" echo "rescue: $RC_rescue" echo "desko-next: $RC_desko_next" echo "lappy-next: $RC_lappy_next" echo "servo-next: $RC_servo_next" echo "moby-next: $RC_moby_next" + echo "crappy-next: $RC_crappy_next" echo "rescue-next: $RC_rescue_next" # i don't really care if the -next hosts fail. i build them mostly to keep the cache fresh/ready - exit $(($RC_desko | $RC_lappy | $RC_servo | $RC_moby | $RC_rescue)) + exit $(($RC_desko | $RC_lappy | $RC_servo | $RC_moby | $RC_crappy | $RC_rescue)) '' ); };