colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

rename flavored hosts to $hostName{-light,-min}{-staging,-next}

Browse Source 
i.e. swap the order of those two parameters
This commit is contained in:
Colin
2025-03-08 09:38:45 +00:00
parent 9a87622ce6
commit 6554c8ea52
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
impure.nix
View File

@@ -39,18 +39,15 @@ let
});
in addPassthru plainHost;
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"; });
"${args.name}-light" = mkFlavoredHost (args // { variant = "light"; });
"${args.name}-light-next" = mkFlavoredHost (args // { variant = "light"; branch = "staging-next"; });
"${args.name}-light-staging" = mkFlavoredHost (args // { variant = "light"; branch = "staging"; });
"${args.name}-min" = mkFlavoredHost (args // { variant = "min"; });
"${args.name}-min-next" = mkFlavoredHost (args // { variant = "min"; branch = "staging-next"; });
"${args.name}-min-staging" = mkFlavoredHost (args // { variant = "min"; branch = "staging"; });
"${args.name}-staging" = mkFlavoredHost (args // { branch = "staging"; });
"${args.name}-staging-light" = mkFlavoredHost (args // { branch = "staging"; variant = "light"; });
"${args.name}-staging-min" = mkFlavoredHost (args // { branch = "staging"; variant = "min"; });
"${args.name}-next" = mkFlavoredHost (args // { branch = "staging-next"; });
"${args.name}-next-light" = mkFlavoredHost (args // { branch = "staging-next"; variant = "light"; });
"${args.name}-next-min" = mkFlavoredHost (args // { branch = "staging-next"; variant = "min"; });
};
# this exists to unify my kernel configs across different platforms.

4
scripts/deploy
View File

@@ -55,7 +55,7 @@ addHost() {
}
addVariant() {
if [ "$1" = all ]; then
variants+=("-min" "-light" "" "-min-next" "-light-next" "-next")
variants+=("-min" "-light" "" "-next-min" "-next-light" "-next")
elif [ -n "$1" ]; then
variants+=("-$1")
else
@@ -165,7 +165,7 @@ timeoutFor() {
(-min|-light|-next)
echo 3600
;;
(-min-next|-light-next)
(-next-min|-next-light)
echo 1800
;;
(*)