about summary refs log tree commit diff
path: root/nixos/modules/services/continuous-integration
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2023-02-26 08:05:05 -0500
committerGitHub <noreply@github.com>2023-02-26 08:05:05 -0500
commitd8c0a9204af30100866e3b8471b8b4669ddd99cb (patch)
tree42db1e835a06f5e6410fe00dac3fdd8f6454fa01 /nixos/modules/services/continuous-integration
parentfec6db1daf4517e05b472873bb016f6c86dc219b (diff)
parent36949b9718fdaf0018b29c8598661ec758ac7b39 (diff)
downloadnixlib-d8c0a9204af30100866e3b8471b8b4669ddd99cb.tar
nixlib-d8c0a9204af30100866e3b8471b8b4669ddd99cb.tar.gz
nixlib-d8c0a9204af30100866e3b8471b8b4669ddd99cb.tar.bz2
nixlib-d8c0a9204af30100866e3b8471b8b4669ddd99cb.tar.lz
nixlib-d8c0a9204af30100866e3b8471b8b4669ddd99cb.tar.xz
nixlib-d8c0a9204af30100866e3b8471b8b4669ddd99cb.tar.zst
nixlib-d8c0a9204af30100866e3b8471b8b4669ddd99cb.zip
Merge pull request #217834 from yaxitech/gh-runner-workdir-clean
nixos/github-runners: clean `workDir` as root
Diffstat (limited to 'nixos/modules/services/continuous-integration')
-rw-r--r--nixos/modules/services/continuous-integration/github-runner/service.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/services/continuous-integration/github-runner/service.nix b/nixos/modules/services/continuous-integration/github-runner/service.nix
index db9a19815ec1..3d11728ebfdd 100644
--- a/nixos/modules/services/continuous-integration/github-runner/service.nix
+++ b/nixos/modules/services/continuous-integration/github-runner/service.nix
@@ -124,6 +124,8 @@ in
               # The state directory is entirely empty which indicates a first start
               copy_tokens
             fi
+            # Always clean workDir
+            find -H "$WORK_DIRECTORY" -mindepth 1 -delete
           '';
           configureRunner = writeScript "configure" ''
             if [[ -e "${newConfigTokenPath}" ]]; then
@@ -159,9 +161,6 @@ in
             fi
           '';
           setupWorkDir = writeScript "setup-work-dirs" ''
-            # Cleanup previous service
-            ${pkgs.findutils}/bin/find -H "$WORK_DIRECTORY" -mindepth 1 -delete
-
             # Link _diag dir
             ln -s "$LOGS_DIRECTORY" "$WORK_DIRECTORY/_diag"