Try fixing remote-builders
This commit is contained in:
parent
3ab4a41285
commit
ff368ebfc6
|
@ -11,7 +11,7 @@
|
||||||
export PATH=${lib.makeBinPath path}:$PATH
|
export PATH=${lib.makeBinPath path}:$PATH
|
||||||
git clone git@localhost:${name} .
|
git clone git@localhost:${name} .
|
||||||
git show -q --oneline
|
git show -q --oneline
|
||||||
export FLAGS="--builders @$(${pkgs.builders-configurator}/bin/builders-configurators) -o /var/cache/gc-links/$JOB"
|
export FLAGS="--builders @$(${pkgs.builders-configurator}/bin/builders-configurator) -o /var/cache/gc-links/$JOB"
|
||||||
if [[ -e "flake.nix" ]]; then
|
if [[ -e "flake.nix" ]]; then
|
||||||
echo "Flake detected."
|
echo "Flake detected."
|
||||||
echo "Running 'flake check'"
|
echo "Running 'flake check'"
|
||||||
|
|
|
@ -19,7 +19,7 @@ import Say
|
||||||
import Shh
|
import Shh
|
||||||
import System.Environment (getEnv)
|
import System.Environment (getEnv)
|
||||||
|
|
||||||
load Absolute ["laminarc", "git", "nix"]
|
load Absolute ["laminarc", "git", "nix", "builders-configurator"]
|
||||||
|
|
||||||
repo = "git@hera.m-0.eu:nixos-config"
|
repo = "git@hera.m-0.eu:nixos-config"
|
||||||
|
|
||||||
|
@ -32,8 +32,9 @@ main = do
|
||||||
git "clone" repo "."
|
git "clone" repo "."
|
||||||
git "checkout" (toString branch)
|
git "checkout" (toString branch)
|
||||||
say "Running checks"
|
say "Running checks"
|
||||||
nix "flake" "check" "--builders" "@/etc/nix/machines" "--accept-flake-config"
|
builders <- builders_configurator |> captureTrim
|
||||||
nix ["build", ".#checks.x86_64-linux.system-checks", "-o", "/var/cache/gc-links/test-config", "--builders", "@/etc/nix/machines", "--accept-flake-config"]
|
nix "flake" "check" "--builders" ([i|@#{builders}|] :: String) "--accept-flake-config"
|
||||||
|
nix ["build", ".#checks.x86_64-linux.system-checks", "-o", "/var/cache/gc-links/test-config", "--builders", [i|@#{builders}|], "--accept-flake-config"]
|
||||||
say "Checks succeeded"
|
say "Checks succeeded"
|
||||||
when (branch == "main") $ do
|
when (branch == "main") $ do
|
||||||
say [i|Deploying new config to localhost.|]
|
say [i|Deploying new config to localhost.|]
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
bins = lib.attrValues {inherit (pkgs) git nix gnutar xz gzip openssh laminar;};
|
bins = lib.attrValues {inherit (pkgs) git nix gnutar xz gzip openssh laminar builders-configurator;};
|
||||||
standardPath = lib.makeBinPath bins;
|
standardPath = lib.makeBinPath bins;
|
||||||
systems = builtins.attrNames (builtins.readDir ../../machines);
|
systems = builtins.attrNames (builtins.readDir ../../machines);
|
||||||
homes = lib.attrNames (import ../../../home-manager/machines.nix);
|
homes = lib.attrNames (import ../../../home-manager/machines.nix);
|
||||||
|
|
Loading…
Reference in a new issue