Unverified Commit d8c0a920 authored by Aaron Andersen's avatar Aaron Andersen Committed by GitHub
Browse files

Merge pull request #217834 from yaxitech/gh-runner-workdir-clean 

nixos/github-runners: clean `workDir` as root
parents fec6db1d 36949b97

nixos/modules/services/continuous-integration/github-runner/service.nix

+2 −3
Original line number Diff line number Diff line
@@ -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"