From 0540e8472935d79fbdfc11797d6670747b9db870 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Tue, 26 Mar 2024 17:20:55 -0400 Subject: [PATCH] gr: Factor out the config --- clusters/github-runner/nixos-module.nix | 9 ++------- clusters/github-runner/repos.nix | 10 ++++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 clusters/github-runner/repos.nix diff --git a/clusters/github-runner/nixos-module.nix b/clusters/github-runner/nixos-module.nix index 19f0062..a0960fc 100644 --- a/clusters/github-runner/nixos-module.nix +++ b/clusters/github-runner/nixos-module.nix @@ -6,6 +6,7 @@ let user = "github-runner"; group = "github-runner"; tokenFile = "/run/keys/github-runner-token.secret"; # See colmena keys in top-level flake.nix + repos = import ./repos.nix; # Convenient function to create multiple runners per single personal repo. mkPersonalRunners = user: lib.concatMapAttrs (repoName: meta: @@ -50,19 +51,13 @@ in nix.settings.trusted-users = [ user ]; # Runners - services.github-runners = mkPersonalRunners "srid" { - haskell-flake.num = 2 * 7; - nixos-config.num = 2; - nixos-flake.num = 2 * 5; - perpetuum.num = 2; - }; + services.github-runners = mkPersonalRunners "srid" repos.srid; # macOS remote builder nix.distributedBuilds = true; nix.buildMachines = [{ hostName = hostIP; systems = [ "aarch64-darwin" "x86_64-darwin" ]; - # supportedFeatures = [ "kvm" "benchmark" "big-parallel" ]; maxJobs = 6; # 6 cores protocol = "ssh-ng"; sshUser = user; diff --git a/clusters/github-runner/repos.nix b/clusters/github-runner/repos.nix new file mode 100644 index 0000000..52f63db --- /dev/null +++ b/clusters/github-runner/repos.nix @@ -0,0 +1,10 @@ +{ + # My personal repos with self-hosted runners: + # `num` is usually based on matrix configuration size + srid = { + haskell-flake.num = 2 * 7; + nixos-config.num = 2; + nixos-flake.num = 2 * 5; + perpetuum.num = 2; + }; +}