···

       
26
       
26
       
 
       
    default = { };

     

       
27
       
27
       
 
       
    type = lib.types.attrsOf (

     

       
28
       
28
       
 
       
      lib.types.submodule (

     

       
29
       
29
       
-
       
        { name, ... }:

     

       
29
       
29
       
+
       
        { name, config, ... }:

     

       
30
       
30
       
 
       
        {

     

       
31
       
31
       
 
       
          options = {

     

       
32
       
32
       
 
       
            enable = lib.mkOption {

     
···

       
186
       
186
       
 
       
              default = { };

     

       
187
       
187
       
 
       
            };

     

       
188
       
188
       
 
       


     

       
189
       
189
       
-
       
            package = lib.mkPackageOption pkgs "github-runner" { };

     

       
189
       
189
       
+
       
            package = lib.mkPackageOption pkgs "github-runner" { } // {

     

       
190
       
190
       
+
       
              apply =

     

       
191
       
191
       
+
       
                # Support old github-runner versions which don't have the `nodeRuntimes` arg yet.

     

       
192
       
192
       
+
       
                pkg: pkg.override (old: lib.optionalAttrs (old ? nodeRuntimes) { inherit (config) nodeRuntimes; });

     

       
193
       
193
       
+
       
            };

     

       
190
       
194
       
 
       


     

       
191
       
195
       
 
       
            ephemeral = lib.mkOption {

     

       
192
       
196
       
 
       
              type = lib.types.bool;

     

···

       
41
       
41
       
 
       
        currentConfigTokenFilename = ".current-token";

     

       
42
       
42
       
 
       


     

       
43
       
43
       
 
       
        workDir = if cfg.workDir == null then runtimeDir else cfg.workDir;

     

       
44
       
44
       
-
       
        # Support old github-runner versions which don't have the `nodeRuntimes` arg yet.

     

       
45
       
45
       
-
       
        package = cfg.package.override (

     

       
46
       
46
       
-
       
          old: lib.optionalAttrs (lib.hasAttr "nodeRuntimes" old) { inherit (cfg) nodeRuntimes; }

     

       
47
       
47
       
-
       
        );

     

       
48
       
44
       
 
       
      in

     

       
49
       
45
       
 
       
      lib.nameValuePair svcName {

     

       
50
       
46
       
 
       
        description = "GitHub Actions runner";

     
···

       
77
       
73
       
 
       


     

       
78
       
74
       
 
       
        serviceConfig = lib.mkMerge [

     

       
79
       
75
       
 
       
          {

     

       
80
       
80
       
-
       
            ExecStart = "${package}/bin/Runner.Listener run --startuptype service";

     

       
76
       
76
       
+
       
            ExecStart = "${cfg.package}/bin/Runner.Listener run --startuptype service";

     

       
81
       
77
       
 
       


     

       
82
       
78
       
 
       
            # Does the following, sequentially:

     

       
83
       
79
       
 
       
            # - If the module configuration or the token has changed, purge the state directory,

     
···

       
196
       
192
       
 
       
                        else

     

       
197
       
193
       
 
       
                          args+=(--token "$token")

     

       
198
       
194
       
 
       
                        fi

     

       
199
       
199
       
-
       
                        ${package}/bin/Runner.Listener configure "''${args[@]}"

     

       
195
       
195
       
+
       
                        ${cfg.package}/bin/Runner.Listener configure "''${args[@]}"

     

       
200
       
196
       
 
       
                        # Move the automatically created _diag dir to the logs dir

     

       
201
       
197
       
 
       
                        mkdir -p  "$STATE_DIRECTORY/_diag"

     

       
202
       
198
       
 
       
                        cp    -r  "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/"