From 01cfed2438832c45de8a8c6366b037365b7a70fc Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 14 Jun 2024 20:21:45 +0000
Subject: [PATCH] scripts/deploy: swap the iteration order: build all hosts at
 -min variant, then -light, etc; then also do the -next variants

---
 default.nix    | 3 +++
 scripts/deploy | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index e2f98ef0..f7563010 100644
--- a/default.nix
+++ b/default.nix
@@ -38,6 +38,9 @@ let
     };
   });
   mkHost = args: {
+    # TODO: swap order: $host-{next,staging}-{min,light}:
+    # then lexicographically-adjacent targets would also have the minimal difference in closure,
+    # and the order in which each target should be built is more evident
     "${args.name}" = mkFlavoredHost args;
     "${args.name}-next" = mkFlavoredHost args // { branch = "staging-next"; };
     "${args.name}-staging" = mkFlavoredHost args // { branch = "staging"; };
diff --git a/scripts/deploy b/scripts/deploy
index c51d9c78..1262eefb 100755
--- a/scripts/deploy
+++ b/scripts/deploy
@@ -121,12 +121,12 @@ deployHelper() {
   local host="$1"
   local variant="$2"
 
-  if [ "$host" = "all" ]; then
-    for host in moby lappy crappy servo desko; do
+  if [ "$variant" = "all" ]; then
+    for variant in -min -light "" "-min-next" "-light-next" "-next"; do
       deployHelper "$host" "$variant"
     done
-  elif [ "$variant" = "all" ]; then
-    for variant in -min -light ""; do
+  elif [ "$host" = "all" ]; then
+    for host in moby lappy crappy servo desko; do
       deployHelper "$host" "$variant"
     done
   else