diff options
| author | Maciej Pasternacki <maciej@3ofcoins.net> | 2023-01-08 17:00:51 +0100 |
|---|---|---|
| committer | Maciej Pasternacki <maciej@3ofcoins.net> | 2023-01-08 17:36:45 +0100 |
| commit | d5cb89b024a347d3f27e45f6f1f5332ff22905c6 (patch) | |
| tree | 0f41f6cf7813eb47dada507270e4f980262b5384 /nixos/modules/services/continuous-integration | |
| parent | 194b1690e7a94880b74abe538f43a371ec8b4f37 (diff) | |
nixos/gitlab-runner: fix problems introduced by last #209716
Diffstat (limited to 'nixos/modules/services/continuous-integration')
| -rw-r--r-- | nixos/modules/services/continuous-integration/gitlab-runner.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index d18c4cff04057..3f697739bef0f 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -9,14 +9,14 @@ let The hash is recorded in the runner's name because we can't do better yet See https://gitlab.com/gitlab-org/gitlab-runner/-/issues/29350 for more details */ - genRunnerName = service: let + genRunnerName = name: service: let hash = substring 0 12 (hashString "md5" (unsafeDiscardStringContext (toJSON service))); - in if service ? description + in if service ? description && service.description != null then "${hash} ${service.description}" else "${name}_${config.networking.hostName}_${hash}"; hashedServices = mapAttrs' - (name: service: nameValuePair (genRunnerName service) service) cfg.services; + (name: service: nameValuePair (genRunnerName name service) service) cfg.services; configPath = ''"$HOME"/.gitlab-runner/config.toml''; configureScript = pkgs.writeShellApplication { name = "gitlab-runner-configure"; @@ -38,7 +38,7 @@ let '' else '' export CONFIG_FILE=${configPath} - mkdir -p "$(dirname "${configPath}")" + mkdir -p "$(dirname ${configPath})" touch ${configPath} # update global options |