From 03707e9d0175bc19e062a0ca4d0b71f5aa9a9f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Tue, 6 Dec 2022 10:05:04 +0100
Subject: nixos/mrpump: add check-suite runner

---
 flake.lock               |  8 ++++----
 nixos/machine/mrpump.nix | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index abeb47c..4f2ab87 100644
--- a/flake.lock
+++ b/flake.lock
@@ -219,11 +219,11 @@
     },
     "personal-secret": {
       "locked": {
-        "lastModified": 1668775351,
-        "narHash": "sha256-trYyXzWkkDxQFXqIwsG5WE48IYfUXfP/NcGduVJiyAo=",
+        "lastModified": 1670315643,
+        "narHash": "sha256-KT5U9pGfphdFOZ1gGicfwIs+soQRxP00oUrueNZiDLg=",
         "ref": "refs/heads/master",
-        "rev": "c705f2a25ee5da3d2dc63f6084db770dd11d8694",
-        "revCount": 36,
+        "rev": "ab8dfca205f82ef3809027d582961d425e308214",
+        "revCount": 37,
         "type": "git",
         "url": "ssh://git@cynerd.cz/nixos-personal-secret"
       },
diff --git a/nixos/machine/mrpump.nix b/nixos/machine/mrpump.nix
index e3af017..623f438 100644
--- a/nixos/machine/mrpump.nix
+++ b/nixos/machine/mrpump.nix
@@ -56,12 +56,13 @@ with lib;
 
     # Gitlab runner
     systemd.services.gitlab-runner.serviceConfig = let
+      name2var = name: replaceStrings ["-"] ["_"] (toUpper name);
       runners = project: [
         {
           name = "MrPump Docker (${project})";
           url = "https://gitlab.com";
           id = 18138767;
-          token = "@TOKEN_${toUpper project}_DOCKER@";
+          token = "@TOKEN_${name2var project}_DOCKER@";
           executor = "docker";
           docker = {
             image = "alpine";
@@ -71,7 +72,7 @@ with lib;
           name = "MrPump Nix (${project})";
           url = "https://gitlab.com";
           id = 18139391;
-          token = "@TOKEN_${toUpper project}_NIX@";
+          token = "@TOKEN_${name2var project}_NIX@";
           executor = "docker";
           docker = {
             image = "local/nix:latest";
@@ -97,7 +98,10 @@ with lib;
       ];
       config = (pkgs.formats.toml{}).generate "gitlab-runner.toml" {
         concurrent = 1;
-        runners = (runners "LogC") ++ (runners "NixTurris");
+        runners =
+          (runners "LogC") ++
+          (runners "NixTurris") ++
+          (runners "Check-Suite");
       };
       configPath = "$HOME/.gitlab-runner/config.toml";
       configureScript = pkgs.writeShellScript "gitlab-runner-configure" ''
-- 
cgit v1.2.3