From 65542a6348b50d62198a1a992723cdd6dbaaa137 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 19 Jul 2022 13:00:15 +0200 Subject: [PATCH] nixos/github-runner: use state instead of runtime dir as `RUNNER_ROOT` Using the runtime directory as `RUNNER_ROOT` is wrong. We should always use the state directory like we already do when invoking the runner configure script. Otherwise, the runner constructs the wrong path for some files (.credentials, .runner, ...). --- .../modules/services/continuous-integration/github-runner.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/continuous-integration/github-runner.nix b/nixos/modules/services/continuous-integration/github-runner.nix index 54003382368..788457d68b9 100644 --- a/nixos/modules/services/continuous-integration/github-runner.nix +++ b/nixos/modules/services/continuous-integration/github-runner.nix @@ -136,7 +136,7 @@ in environment = { HOME = runtimeDir; - RUNNER_ROOT = runtimeDir; + RUNNER_ROOT = stateDir; }; path = (with pkgs; [ @@ -213,7 +213,7 @@ in echo "Configuring GitHub Actions Runner" token=$(< "$STATE_DIRECTORY"/${newConfigTokenFilename}) - RUNNER_ROOT="$STATE_DIRECTORY" ${cfg.package}/bin/config.sh \ + ${cfg.package}/bin/config.sh \ --unattended \ --disableupdate \ --work "$RUNTIME_DIRECTORY" \