commit edff57cff41bc4fc162e66a81abcda97d2410982 · pyrox.dev/nixpkgs

+1 -1

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

···

       149
       149
        
                     else

     

       150
       150
        
                       args+=(--token "$token")

     

       151
       151
        
                     fi

     

       152
       152
       -
                     ${cfg.package}/bin/config.sh "''${args[@]}"

     

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

     

       153
       153
        
                     # Move the automatically created _diag dir to the logs dir

     

       154
       154
        
                     mkdir -p  "$STATE_DIRECTORY/_diag"

     

       155
       155
        
                     cp    -r  "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/"

nixos/tests/all-tests.nix

···

       243
       243
        
         ghostunnel = handleTest ./ghostunnel.nix {};

     

       244
       244
        
         gitdaemon = handleTest ./gitdaemon.nix {};

     

       245
       245
        
         gitea = handleTest ./gitea.nix { giteaPackage = pkgs.gitea; };

     

       246
       246
       +
         github-runner = handleTest ./github-runner.nix {};

     

       246
       247
        
         gitlab = handleTest ./gitlab.nix {};

     

       247
       248
        
         gitolite = handleTest ./gitolite.nix {};

     

       248
       249
        
         gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {};

+37

nixos/tests/github-runner.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "github-runner";

     

       4
       4
       +
         meta = with pkgs.lib.maintainers; {

     

       5
       5
       +
           maintainers = [ veehaitch ];

     

       6
       6
       +
         };

     

       7
       7
       +
         nodes.machine = { pkgs, ... }: {

     

       8
       8
       +
           services.github-runners.test = {

     

       9
       9
       +
             enable = true;

     

       10
       10
       +
             url = "https://github.com/yaxitech";

     

       11
       11
       +
             tokenFile = builtins.toFile "github-runner.token" "not-so-secret";

     

       12
       12
       +
           };

     

       13
       13
       +
       

     

       14
       14
       +
           systemd.services.dummy-github-com = {

     

       15
       15
       +
             wantedBy = [ "multi-user.target" ];

     

       16
       16
       +
             before = [ "github-runner-test.service" ];

     

       17
       17
       +
             script = "${pkgs.netcat}/bin/nc -Fl 443 | true && touch /tmp/registration-connect";

     

       18
       18
       +
           };

     

       19
       19
       +
           networking.hosts."127.0.0.1" = [ "api.github.com" ];

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         testScript = ''

     

       23
       23
       +
           start_all()

     

       24
       24
       +
       

     

       25
       25
       +
           machine.wait_for_unit("dummy-github-com")

     

       26
       26
       +
       

     

       27
       27
       +
           try:

     

       28
       28
       +
             machine.wait_for_unit("github-runner-test")

     

       29
       29
       +
           except Exception:

     

       30
       30
       +
             pass

     

       31
       31
       +
       

     

       32
       32
       +
           out = machine.succeed("journalctl -u github-runner-test")

     

       33
       33
       +
           assert "Self-hosted runner registration" in out, "did not read runner registration header"

     

       34
       34
       +
       

     

       35
       35
       +
           machine.wait_until_succeeds("test -f /tmp/registration-connect")

     

       36
       36
       +
         '';

     

       37
       37
       +
       })

+133 -228

pkgs/development/tools/continuous-integration/github-runner/default.nix

···

       1
       1
        
       { autoPatchelfHook

     

       2
       2
        
       , autoSignDarwinBinariesHook

     

       3
       3
       -
       , coreutils

     

       4
       4
       -
       , curl

     

       3
       3
       +
       , buildDotnetModule

     

       5
       4
        
       , dotnetCorePackages

     

       6
       6
       -
       , dotnetPackages

     

       7
       5
        
       , fetchFromGitHub

     

       8
       8
       -
       , fetchurl

     

       6
       6
       +
       , fetchpatch

     

       9
       7
        
       , git

     

       10
       8
        
       , glibc

     

       11
       11
       -
       , icu

     

       12
       12
       -
       , libkrb5

     

       9
       9
       +
       , glibcLocales

     

       13
       10
        
       , lib

     

       14
       14
       -
       , linkFarmFromDrvs

     

       15
       15
       -
       , lttng-ust

     

       16
       16
       -
       , makeWrapper

     

       11
       11
       +
       , nixosTests

     

       17
       12
        
       , nodejs-16_x

     

       18
       18
       -
       , openssl

     

       19
       13
        
       , stdenv

     

       20
       20
       -
       , zlib

     

       21
       21
       -
       , writeShellApplication

     

       22
       22
       -
       , nuget-to-nix

     

       14
       14
       +
       , which

     

       23
       15
        
       }:

     

       24
       24
       -
       let

     

       25
       25
       -
         fetchNuGet = { pname, version, sha256 }: fetchurl {

     

       26
       26
       -
           name = "${pname}.${version}.nupkg";

     

       27
       27
       -
           url = "https://www.nuget.org/api/v2/package/${pname}/${version}";

     

       28
       28
       -
           inherit sha256;

     

       29
       29
       -
         };

     

       30
       30
       -
       

     

       31
       31
       -
         nugetSource = linkFarmFromDrvs "nuget-packages" (

     

       32
       32
       -
           import ./deps.nix { inherit fetchNuGet; }

     

       33
       33
       -
         );

     

       34
       34
       -
       

     

       35
       35
       -
         dotnetSdk = dotnetCorePackages.sdk_6_0;

     

       36
       36
       -
         # Map Nix systems to .NET runtime ids

     

       37
       37
       -
         runtimeIds = {

     

       38
       38
       -
           "x86_64-linux" = "linux-x64";

     

       39
       39
       -
           "aarch64-linux" = "linux-arm64";

     

       40
       40
       -
           "x86_64-darwin" = "osx-x64";

     

       41
       41
       -
           "aarch64-darwin" = "osx-arm64";

     

       42
       42
       -
         };

     

       43
       43
       -
         runtimeId = runtimeIds.${stdenv.system};

     

       44
       44
       -
         fakeSha1 = "0000000000000000000000000000000000000000";

     

       45
       45
       -
       in

     

       46
       46
       -
       stdenv.mkDerivation rec {

     

       16
       16
       +
       buildDotnetModule rec {

     

       47
       17
        
         pname = "github-runner";

     

       48
       18
        
         version = "2.302.1";

     

       49
       19
        
       

     
···

       51
       21
        
           owner = "actions";

     

       52
       22
        
           repo = "runner";

     

       53
       23
        
           rev = "v${version}";

     

       54
       54
       -
           hash = "sha256-l7kGKhHpE5kEo8QMmwZKnG4cctj2INhnko7KfAXfrQ8=";

     

       24
       24
       +
           hash = "sha256-hPZzqTJGwcBxajLjU0TuIQ2KLnDl9E66seuutm9JWDo=";

     

       25
       25
       +
           # Required to obtain HEAD's Git commit hash

     

       26
       26
       +
           leaveDotGit = true;

     

       55
       27
        
         };

     

       56
       28
        
       

     

       57
       57
       -
         nativeBuildInputs = [

     

       58
       58
       -
           dotnetSdk

     

       59
       59
       -
           dotnetPackages.Nuget

     

       60
       60
       -
           makeWrapper

     

       61
       61
       -
         ] ++ lib.optionals stdenv.isLinux [

     

       62
       62
       -
           autoPatchelfHook

     

       63
       63
       -
         ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [

     

       64
       64
       -
           autoSignDarwinBinariesHook

     

       65
       65
       -
         ];

     

       66
       66
       -
       

     

       67
       67
       -
         buildInputs = [

     

       68
       68
       -
           curl # libcurl.so.4

     

       69
       69
       -
           libkrb5 # libgssapi_krb5.so.2

     

       70
       70
       -
           stdenv.cc.cc.lib # libstdc++.so.6

     

       71
       71
       -
           zlib # libz.so.1

     

       72
       72
       -
           icu

     

       73
       73
       -
         ] ++ lib.optionals stdenv.isLinux [

     

       74
       74
       -
           lttng-ust # liblttng-ust.so.0

     

       75
       75
       -
         ];

     

       76
       29
        
       

     

       77
       30
        
         patches = [

     

       78
       78
       -
           # Don't run Git, no restore on build/test

     

       79
       79
       -
           ./patches/dir-proj.patch

     

       80
       31
        
           # Replace some paths that originally point to Nix's read-only store

     

       81
       32
        
           ./patches/host-context-dirs.patch

     

       82
       33
        
           # Use GetDirectory() to obtain "diag" dir

     

       83
       34
        
           ./patches/use-get-directory-for-diag.patch

     

       84
       84
       -
           # Don't try to install systemd service

     

       85
       85
       -
           ./patches/dont-install-systemd-service.patch

     

       35
       35
       +
           # Don't try to install service

     

       36
       36
       +
           ./patches/dont-install-service.patch

     

       37
       37
       +
           # Access `.env` and `.path` relative to `$RUNNER_ROOT`, if set

     

       38
       38
       +
           ./patches/env-sh-use-runner-root.patch

     

       39
       39
       +
           # Fix FHS path: https://github.com/actions/runner/pull/2464

     

       40
       40
       +
           (fetchpatch {

     

       41
       41
       +
             name = "ln-fhs.patch";

     

       42
       42
       +
             url = "https://github.com/actions/runner/commit/5ff0ce1.patch";

     

       43
       43
       +
             hash = "sha256-2Vg3cKZK3cE/OcPDZkdN2Ro2WgvduYTTwvNGxwCfXas=";

     

       44
       44
       +
           })

     

       86
       45
        
         ];

     

       87
       46
        
       

     

       88
       47
        
         postPatch = ''

     

       89
       89
       -
           # Relax the version requirement

     

       90
       90
       -
           substituteInPlace src/global.json \

     

       91
       91
       -
             --replace '6.0.300' '${dotnetSdk.version}'

     

       92
       92
       -
       

     

       93
       93
       -
           # Disable specific tests

     

       94
       94
       -
           substituteInPlace src/dir.proj \

     

       95
       95
       -
             --replace 'dotnet test Test/Test.csproj' \

     

       96
       96
       -
                       "dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&amp;" (map (x: "FullyQualifiedName!=${x}") disabledTests)}'"

     

       97
       97
       -
       

     

       98
       98
       -
           # We don't use a Git checkout

     

       48
       48
       +
           # Ignore changes to src/Runner.Sdk/BuildConstants.cs

     

       99
       49
        
           substituteInPlace src/dir.proj \

     

       100
       50
        
             --replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \

     

       101
       101
       -
                       'echo Patched out.'

     

       102
       102
       -
       

     

       103
       103
       -
           # Fix FHS path

     

       104
       104
       -
           substituteInPlace src/Test/L0/Util/IOUtilL0.cs \

     

       105
       105
       -
             --replace '/bin/ln' '${coreutils}/bin/ln'

     

       51
       51
       +
                       'true'

     

       106
       52
        
         '';

     

       107
       53
        
       

     

       108
       108
       -
         DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = stdenv.isDarwin;

     

       54
       54
       +
         DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = isNull glibcLocales;

     

       55
       55
       +
         LOCALE_ARCHIVE = lib.optionalString (!DOTNET_SYSTEM_GLOBALIZATION_INVARIANT) "${glibcLocales}/lib/locale/locale-archive";

     

       109
       56
        
       

     

       110
       110
       -
         configurePhase = ''

     

       111
       111
       -
           runHook preConfigure

     

       57
       57
       +
         postConfigure = ''

     

       58
       58
       +
           # Generate src/Runner.Sdk/BuildConstants.cs

     

       59
       59
       +
           dotnet msbuild \

     

       60
       60
       +
             -t:GenerateConstant \

     

       61
       61
       +
             -p:ContinuousIntegrationBuild=true \

     

       62
       62
       +
             -p:Deterministic=true \

     

       63
       63
       +
             -p:PackageRuntime="${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" \

     

       64
       64
       +
             -p:RunnerVersion="${version}" \

     

       65
       65
       +
             src/dir.proj

     

       66
       66
       +
         '';

     

       112
       67
        
       

     

       113
       113
       -
           export HOME=$(mktemp -d)

     

       114
       114
       -
       

     

       115
       115
       -
           # Never use nuget.org

     

       116
       116
       -
           nuget sources Disable -Name "nuget.org"

     

       117
       117
       -
       

     

       118
       118
       -
           # Restore the dependencies

     

       119
       119
       -
           dotnet restore src/ActionsRunner.sln \

     

       120
       120
       -
             --runtime "${runtimeId}" \

     

       121
       121
       -
             --source "${dotnetSdk.packages}" \

     

       122
       122
       -
             --source "${nugetSource}"

     

       68
       68
       +
         nativeBuildInputs = [

     

       69
       69
       +
           git

     

       70
       70
       +
           which

     

       71
       71
       +
         ] ++ lib.optionals stdenv.isLinux [

     

       72
       72
       +
           autoPatchelfHook

     

       73
       73
       +
         ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [

     

       74
       74
       +
           autoSignDarwinBinariesHook

     

       75
       75
       +
         ];

     

       123
       76
        
       

     

       124
       124
       -
           runHook postConfigure

     

       125
       125
       -
         '';

     

       77
       77
       +
         buildInputs = [ stdenv.cc.cc.lib ];

     

       126
       78
        
       

     

       127
       127
       -
         buildPhase = ''

     

       128
       128
       -
           runHook preBuild

     

       79
       79
       +
         dotnet-sdk = dotnetCorePackages.sdk_6_0;

     

       80
       80
       +
         dotnet-runtime = dotnetCorePackages.runtime_6_0;

     

       129
       81
        
       

     

       130
       130
       -
           dotnet msbuild \

     

       131
       131
       -
             -t:Build \

     

       132
       132
       -
             -p:PackageRuntime="${runtimeId}" \

     

       133
       133
       -
             -p:BUILDCONFIG="Release" \

     

       134
       134
       -
             -p:RunnerVersion="${version}" \

     

       135
       135
       -
             -p:GitInfoCommitHash="${fakeSha1}" \

     

       136
       136
       -
             src/dir.proj

     

       82
       82
       +
         dotnetFlags = [ "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ];

     

       137
       83
        
       

     

       138
       138
       -
           runHook postBuild

     

       139
       139
       -
         '';

     

       84
       84
       +
         # As given here: https://github.com/actions/runner/blob/0befa62/src/dir.proj#L33-L41

     

       85
       85
       +
         projectFile = [

     

       86
       86
       +
           "src/Sdk/Sdk.csproj"

     

       87
       87
       +
           "src/Runner.Common/Runner.Common.csproj"

     

       88
       88
       +
           "src/Runner.Listener/Runner.Listener.csproj"

     

       89
       89
       +
           "src/Runner.Worker/Runner.Worker.csproj"

     

       90
       90
       +
           "src/Runner.PluginHost/Runner.PluginHost.csproj"

     

       91
       91
       +
           "src/Runner.Sdk/Runner.Sdk.csproj"

     

       92
       92
       +
           "src/Runner.Plugins/Runner.Plugins.csproj"

     

       93
       93
       +
         ];

     

       94
       94
       +
         nugetDeps = ./deps.nix;

     

       140
       95
        
       

     

       141
       96
        
         doCheck = true;

     

       142
       97
        
       

     
···

       162
       117
        
             "CompositeActionWithActionfile_MaxLimit"

     

       163
       118
        
             "CompositeActionWithActionfile_Node"

     

       164
       119
        
             "DownloadActionFromGraph"

     

       165
       165
       -
             "DownloadActionFromGraph_Legacy"

     

       166
       120
        
             "NotPullOrBuildImagesMultipleTimes"

     

       167
       167
       -
             "NotPullOrBuildImagesMultipleTimes_Legacy"

     

       168
       121
        
             "RepositoryActionWithActionYamlFile_DockerHubImage"

     

       169
       169
       -
             "RepositoryActionWithActionYamlFile_DockerHubImage_Legacy"

     

       170
       122
        
             "RepositoryActionWithActionfileAndDockerfile"

     

       171
       171
       -
             "RepositoryActionWithActionfileAndDockerfile_Legacy"

     

       172
       123
        
             "RepositoryActionWithActionfile_DockerHubImage"

     

       173
       173
       -
             "RepositoryActionWithActionfile_DockerHubImage_Legacy"

     

       174
       124
        
             "RepositoryActionWithActionfile_Dockerfile"

     

       175
       175
       -
             "RepositoryActionWithActionfile_Dockerfile_Legacy"

     

       176
       125
        
             "RepositoryActionWithActionfile_DockerfileRelativePath"

     

       177
       177
       -
             "RepositoryActionWithActionfile_DockerfileRelativePath_Legacy"

     

       178
       126
        
             "RepositoryActionWithActionfile_Node"

     

       179
       179
       -
             "RepositoryActionWithActionfile_Node_Legacy"

     

       180
       127
        
             "RepositoryActionWithDockerfile"

     

       181
       181
       -
             "RepositoryActionWithDockerfile_Legacy"

     

       182
       128
        
             "RepositoryActionWithDockerfileInRelativePath"

     

       183
       183
       -
             "RepositoryActionWithDockerfileInRelativePath_Legacy"

     

       184
       129
        
             "RepositoryActionWithDockerfilePrepareActions_Repository"

     

       185
       130
        
             "RepositoryActionWithInvalidWrapperActionfile_Node"

     

       186
       186
       -
             "RepositoryActionWithInvalidWrapperActionfile_Node_Legacy"

     

       187
       131
        
             "RepositoryActionWithWrapperActionfile_PreSteps"

     

       188
       188
       -
             "RepositoryActionWithWrapperActionfile_PreSteps_Legacy"

     

       189
       132
        
           ]

     

       190
       133
        
           ++ map (x: "GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") [

     

       191
       134
        
             "EnsureDotnetsdkBashDownloadScriptUpToDate"

     
···

       208
       151
        
             "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchCancellation"

     

       209
       152
        
             "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchRunNewJob"

     

       210
       153
        
           ];

     

       211
       211
       -
         nativeCheckInputs = [ git ];

     

       212
       154
        
       

     

       213
       213
       -
         checkPhase = ''

     

       214
       214
       -
           runHook preCheck

     

       155
       155
       +
         testProjectFile = [ "src/Test/Test.csproj" ];

     

       215
       156
        
       

     

       157
       157
       +
         preCheck = ''

     

       216
       158
        
           mkdir -p _layout/externals

     

       217
       159
        
           ln -s ${nodejs-16_x} _layout/externals/node16

     

       218
       218
       -
       

     

       219
       219
       -
           printf 'Disabled tests:\n%s\n' '${lib.concatMapStringsSep "\n" (x: " - ${x}") disabledTests}'

     

       220
       220
       -
       

     

       221
       221
       -
           # BUILDCONFIG needs to be "Debug"

     

       222
       222
       -
           dotnet msbuild \

     

       223
       223
       -
             -t:test \

     

       224
       224
       -
             -p:PackageRuntime="${runtimeId}" \

     

       225
       225
       -
             -p:BUILDCONFIG="Debug" \

     

       226
       226
       -
             -p:RunnerVersion="${version}" \

     

       227
       227
       -
             -p:GitInfoCommitHash="${fakeSha1}" \

     

       228
       228
       -
             src/dir.proj

     

       229
       229
       -
       

     

       230
       230
       -
           runHook postCheck

     

       231
       160
        
         '';

     

       232
       161
        
       

     

       233
       233
       -
         installPhase = ''

     

       234
       234
       -
           runHook preInstall

     

       162
       162
       +
         postInstall = ''

     

       163
       163
       +
           mkdir -p $out/bin

     

       235
       164
        
       

     

       236
       236
       -
           # Copy the built binaries to lib/ instead of bin/ as they

     

       237
       237
       -
           # have to be wrapped in the fixup phase to work

     

       238
       238
       -
           mkdir -p $out/lib

     

       239
       239
       -
           cp -r _layout/bin/. $out/lib/

     

       165
       165
       +
           install -m755 src/Misc/layoutbin/runsvc.sh                 $out/lib/github-runner

     

       166
       166
       +
           install -m755 src/Misc/layoutbin/RunnerService.js          $out/lib/github-runner

     

       167
       167
       +
           install -m755 src/Misc/layoutroot/run.sh                   $out/lib/github-runner

     

       168
       168
       +
           install -m755 src/Misc/layoutroot/run-helper.sh.template   $out/lib/github-runner/run-helper.sh

     

       169
       169
       +
           install -m755 src/Misc/layoutroot/config.sh                $out/lib/github-runner

     

       170
       170
       +
           install -m755 src/Misc/layoutroot/env.sh                   $out/lib/github-runner

     

       240
       171
        
       

     

       241
       241
       -
           # Delete debugging files

     

       242
       242
       -
           find "$out/lib" -type f -name '*.pdb' -delete

     

       172
       172
       +
           # env.sh is patched to not require any wrapping

     

       173
       173
       +
           ln -sr "$out/lib/github-runner/env.sh" "$out/bin/"

     

       243
       174
        
       

     

       244
       244
       -
           # Install the helper scripts to bin/ to resemble the upstream package

     

       245
       245
       -
           mkdir -p $out/bin

     

       246
       246
       -
           install -m755 src/Misc/layoutbin/runsvc.sh                 $out/bin/

     

       247
       247
       -
           install -m755 src/Misc/layoutbin/RunnerService.js          $out/lib/

     

       248
       248
       -
           install -m755 src/Misc/layoutroot/run.sh                   $out/lib/

     

       249
       249
       -
           install -m755 src/Misc/layoutroot/run-helper.sh.template   $out/lib/run-helper.sh

     

       250
       250
       -
           install -m755 src/Misc/layoutroot/config.sh                $out/lib/

     

       251
       251
       -
           install -m755 src/Misc/layoutroot/env.sh                   $out/lib/

     

       252
       252
       -
       

     

       253
       253
       -
           # Rewrite reference in helper scripts from bin/ to lib/

     

       254
       254
       -
           substituteInPlace $out/lib/run.sh    --replace '"$DIR"/bin' '"$DIR"/lib'

     

       255
       255
       -
           substituteInPlace $out/lib/config.sh --replace './bin' $out'/lib' \

     

       256
       256
       -
             --replace 'source ./env.sh' $out/bin/env.sh

     

       175
       175
       +
           substituteInPlace $out/lib/github-runner/config.sh \

     

       176
       176
       +
             --replace './bin/Runner.Listener' "$out/bin/Runner.Listener"

     

       257
       177
        
         '' + lib.optionalString stdenv.isLinux ''

     

       258
       258
       -
           # Make binary paths absolute

     

       259
       259
       -
           substituteInPlace $out/lib/config.sh \

     

       260
       260
       -
             --replace 'ldd' '${glibc.bin}/bin/ldd' \

     

       178
       178
       +
           substituteInPlace $out/lib/github-runner/config.sh \

     

       179
       179
       +
             --replace 'command -v ldd' 'command -v ${glibc.bin}/bin/ldd' \

     

       180
       180
       +
             --replace 'ldd ./bin' '${glibc.bin}/bin/ldd ${dotnet-runtime}/shared/Microsoft.NETCore.App/${dotnet-runtime.version}/' \

     

       261
       181
        
             --replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig'

     

       262
       182
        
         '' + ''

     

       263
       183
        
           # Remove uneeded copy for run-helper template

     

       264
       264
       -
           substituteInPlace $out/lib/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '

     

       265
       265
       -
           substituteInPlace $out/lib/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/'

     

       184
       184
       +
           substituteInPlace $out/lib/github-runner/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '

     

       185
       185
       +
           substituteInPlace $out/lib/github-runner/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/'

     

       266
       186
        
       

     

       267
       187
        
           # Make paths absolute

     

       268
       268
       -
           substituteInPlace $out/bin/runsvc.sh \

     

       269
       269
       -
             --replace './externals' "$out/externals" \

     

       270
       270
       -
             --replace './bin' "$out/lib"

     

       188
       188
       +
           substituteInPlace $out/lib/github-runner/runsvc.sh \

     

       189
       189
       +
             --replace './externals' "$out/lib/externals" \

     

       190
       190
       +
             --replace './bin/RunnerService.js' "$out/lib/github-runner/RunnerService.js"

     

       271
       191
        
       

     

       272
       272
       -
           # The upstream package includes Node {12,16} and expects it at the path

     

       273
       273
       -
           # externals/node{12,16}. As opposed to the official releases, we don't

     

       192
       192
       +
           # The upstream package includes Node 16 and expects it at the path

     

       193
       193
       +
           # externals/node16. As opposed to the official releases, we don't

     

       274
       194
        
           # link the Alpine Node flavors.

     

       275
       275
       -
           mkdir -p $out/externals

     

       276
       276
       -
           ln -s ${nodejs-16_x} $out/externals/node16

     

       195
       195
       +
           mkdir -p $out/lib/externals

     

       196
       196
       +
           ln -s ${nodejs-16_x} $out/lib/externals/node16

     

       277
       197
        
       

     

       278
       198
        
           # Install Nodejs scripts called from workflows

     

       279
       279
       -
           install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/hashFiles/index.js

     

       280
       280
       -
           mkdir -p $out/lib/checkScripts

     

       281
       281
       -
           install src/Misc/layoutbin/checkScripts/* $out/lib/checkScripts/

     

       282
       282
       -
       

     

       283
       283
       -
           runHook postInstall

     

       284
       284
       -
         '';

     

       285
       285
       -
       

     

       286
       286
       -
         # Stripping breaks the binaries

     

       287
       287
       -
         dontStrip = true;

     

       288
       288
       -
       

     

       289
       289
       -
         preFixup = lib.optionalString stdenv.isLinux ''

     

       290
       290
       -
           patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so

     

       291
       291
       -
         '';

     

       292
       292
       -
       

     

       293
       293
       -
         postFixup = ''

     

       294
       294
       -
           fix_rpath() {

     

       295
       295
       -
             patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/$1

     

       296
       296
       -
           }

     

       297
       297
       -
           wrap() {

     

       298
       298
       -
             makeWrapper $out/lib/$1 $out/bin/$1 \

     

       299
       299
       -
               --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (buildInputs ++ [ openssl ])} \

     

       300
       300
       -
               "''${@:2}"

     

       301
       301
       -
           }

     

       199
       199
       +
           install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js

     

       200
       200
       +
           mkdir -p $out/lib/github-runner/checkScripts

     

       201
       201
       +
           install src/Misc/layoutbin/checkScripts/* $out/lib/github-runner/checkScripts/

     

       302
       202
        
         '' + lib.optionalString stdenv.isLinux ''

     

       303
       303
       -
           fix_rpath Runner.Listener

     

       304
       304
       -
           fix_rpath Runner.PluginHost

     

       305
       305
       -
           fix_rpath Runner.Worker

     

       203
       203
       +
           # Wrap explicitly to, e.g., prevent extra entries for LD_LIBRARY_PATH

     

       204
       204
       +
           makeWrapperArgs=()

     

       205
       205
       +
       

     

       206
       206
       +
           # We don't wrap with libicu

     

       207
       207
       +
           substituteInPlace $out/lib/github-runner/config.sh \

     

       208
       208
       +
             --replace '$LDCONFIG_COMMAND -NXv ''${libpath//:/ }' 'echo libicu'

     

       306
       209
        
         '' + ''

     

       307
       307
       -
           wrap Runner.Listener

     

       308
       308
       -
           wrap Runner.PluginHost

     

       309
       309
       -
           wrap Runner.Worker

     

       310
       310
       -
           wrap run.sh --run 'export RUNNER_ROOT=''${RUNNER_ROOT:-$HOME/.github-runner}'

     

       311
       311
       -
           wrap env.sh --run 'cd $RUNNER_ROOT'

     

       312
       312
       -
       

     

       313
       313
       -
           wrap config.sh --run 'export RUNNER_ROOT=''${RUNNER_ROOT:-$HOME/.github-runner}' \

     

       314
       314
       -
             --run 'mkdir -p $RUNNER_ROOT' \

     

       315
       315
       -
             --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} \

     

       316
       316
       -
             --chdir $out

     

       210
       210
       +
           # XXX: Using the corresponding Nix argument does not work as expected:

     

       211
       211
       +
           #      https://github.com/NixOS/nixpkgs/issues/218449

     

       212
       212
       +
           # Common wrapper args for `executables`

     

       213
       213
       +
           makeWrapperArgs+=(

     

       214
       214
       +
             --run 'export RUNNER_ROOT="''${RUNNER_ROOT:-"$HOME/.github-runner"}"'

     

       215
       215
       +
             --run 'mkdir -p "$RUNNER_ROOT"'

     

       216
       216
       +
             --chdir "$out"

     

       217
       217
       +
           )

     

       317
       218
        
         '';

     

       318
       219
        
       

     

       319
       319
       -
         # Script to create deps.nix file for dotnet dependencies. Run it with

     

       320
       320
       -
         # $(nix-build -A github-runner.passthru.createDepsFile)/bin/create-deps-file

     

       321
       321
       -
         #

     

       322
       322
       -
         # Default output path is /tmp/${pname}-deps.nix, but can be overridden with cli argument.

     

       323
       323
       -
         #

     

       324
       324
       -
         # Inspired by passthru.fetch-deps in pkgs/build-support/build-dotnet-module/default.nix

     

       325
       325
       -
         passthru.createDepsFile = writeShellApplication {

     

       326
       326
       -
           name = "create-deps-file";

     

       327
       327
       -
           runtimeInputs = [ coreutils dotnetSdk (nuget-to-nix.override { dotnet-sdk = dotnetSdk; }) ];

     

       328
       328
       -
           text = ''

     

       329
       329
       -
             # Disable telemetry data

     

       330
       330
       -
             export DOTNET_CLI_TELEMETRY_OPTOUT=1

     

       220
       220
       +
         # List of files to wrap

     

       221
       221
       +
         executables = [

     

       222
       222
       +
           "config.sh"

     

       223
       223
       +
           "Runner.Listener"

     

       224
       224
       +
           "Runner.PluginHost"

     

       225
       225
       +
           "Runner.Worker"

     

       226
       226
       +
           "run.sh"

     

       227
       227
       +
           "runsvc.sh"

     

       228
       228
       +
         ];

     

       331
       229
        
       

     

       332
       332
       -
             deps_file="$(realpath "''${1:-$(mktemp -t "${pname}-deps-XXXXXX.nix")}")"

     

       230
       230
       +
         doInstallCheck = true;

     

       231
       231
       +
         installCheckPhase = ''

     

       232
       232
       +
           runHook preInstallCheck

     

       333
       233
        
       

     

       334
       334
       -
             printf "\n* Setup workdir\n"

     

       335
       335
       -
             workdir="$(mktemp -d /tmp/${pname}.XXX)"

     

       336
       336
       -
             HOME="$workdir"/.fake-home

     

       337
       337
       -
             cp -rT "${src}" "$workdir"

     

       338
       338
       -
             chmod -R +w "$workdir"

     

       339
       339
       -
             trap 'rm -rf "$workdir"' EXIT

     

       234
       234
       +
           export RUNNER_ROOT="$TMPDIR"

     

       235
       235
       +
       

     

       236
       236
       +
           $out/bin/config.sh --help >/dev/null

     

       237
       237
       +
           $out/bin/Runner.Listener --help >/dev/null

     

       340
       238
        
       

     

       341
       341
       -
             pushd "$workdir"

     

       239
       239
       +
           version=$($out/bin/Runner.Listener --version)

     

       240
       240
       +
           if [[ "$version" != "${version}" ]]; then

     

       241
       241
       +
             printf 'Unexpected version %s' "$version"

     

       242
       242
       +
             exit 1

     

       243
       243
       +
           fi

     

       342
       244
        
       

     

       343
       343
       -
             mkdir nuget_pkgs

     

       245
       245
       +
           commit=$($out/bin/Runner.Listener --commit)

     

       246
       246
       +
           if [[ "$commit" != "$(git rev-parse HEAD)" ]]; then

     

       247
       247
       +
             printf 'Unexpected commit %s' "$commit"

     

       248
       248
       +
             exit 1

     

       249
       249
       +
           fi

     

       344
       250
        
       

     

       345
       345
       -
             ${lib.concatMapStrings (rid: ''

     

       346
       346
       -
             printf "\n* Restore ${pname} (${rid}) dotnet project\n"

     

       347
       347
       -
             dotnet restore src/ActionsRunner.sln --packages nuget_pkgs --no-cache --force --runtime "${rid}"

     

       348
       348
       -
             '') (lib.attrValues runtimeIds)}

     

       251
       251
       +
           runHook postInstallCheck

     

       252
       252
       +
         '';

     

       349
       253
        
       

     

       350
       350
       -
             printf "\n* Make %s file\n" "$(basename "$deps_file")"

     

       351
       351
       -
             nuget-to-nix "$workdir/nuget_pkgs" "${dotnetSdk.packages}" > "$deps_file"

     

       352
       352
       -
             printf "\n* Dependency file writen to %s" "$deps_file"

     

       353
       353
       -
           '';

     

       254
       254
       +
         passthru = {

     

       255
       255
       +
           tests.smoke-test = nixosTests.github-runner;

     

       256
       256
       +
           updateScript = ./update.sh;

     

       354
       257
        
         };

     

       355
       258
        
       

     

       356
       259
        
         meta = with lib; {

     

       260
       260
       +
           changelog = "https://github.com/actions/runner/releases/tag/v${version}";

     

       357
       261
        
           description = "Self-hosted runner for GitHub Actions";

     

       358
       262
        
           homepage = "https://github.com/actions/runner";

     

       359
       263
        
           license = licenses.mit;

     

       360
       264
        
           maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse zimbatm ];

     

       361
       361
       -
           platforms = attrNames runtimeIds;

     

       265
       265
       +
           platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];

     

       266
       266
       +
           sourceProvenance = with sourceTypes; [ binaryNativeCode ];

     

       362
       267
        
         };

     

       363
       268
        
       }

pkgs/development/tools/continuous-integration/github-runner/deps.nix

···

       1
       1
       +
       # This file was automatically generated by passthru.fetch-deps.

     

       2
       2
       +
       # Please dont edit it manually, your changes might get overwritten!

     

       3
       3
       +
       

     

       1
       4
        
       { fetchNuGet }: [

     

       2
       5
        
         (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; })

     

       3
       6
        
         (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.4"; sha256 = "00fkczf69z2rwarcd8kjjdp47517a0ca6lggn72qbilsp03a5scj"; })

-45

pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch

···

       1
       1
       -
       From 5a850bb7946ce5c0620ac5f072d93a77cc064219 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Aaron Andersen <aaron@fosslib.net>

     

       3
       3
       -
       Date: Thu, 29 Sep 2022 10:12:28 -0400

     

       4
       4
       -
       Subject: [PATCH] [PATCH] Patch dir.proj

     

       5
       5
       -
       

     

       6
       6
       -
       Don't execute Git for GitInfoCommitHash property

     

       7
       7
       -
       Don't restore for build target

     

       8
       8
       -
       Don't restore for test target

     

       9
       9
       -
       ---

     

       10
       10
       -
        src/dir.proj | 8 ++------

     

       11
       11
       -
        1 file changed, 2 insertions(+), 6 deletions(-)

     

       12
       12
       -
       

     

       13
       13
       -
       diff --git a/src/dir.proj b/src/dir.proj

     

       14
       14
       -
       index 056a312..f029720 100644

     

       15
       15
       -
       --- a/src/dir.proj

     

       16
       16
       -
       +++ b/src/dir.proj

     

       17
       17
       -
       @@ -2,9 +2,6 @@

     

       18
       18
       -
        <Project ToolsVersion="14.0" DefaultTargets="Build"

     

       19
       19
       -
            xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

     

       20
       20
       -
            <Target Name="GenerateConstant">

     

       21
       21
       -
       -        <Exec Command="git rev-parse HEAD" ConsoleToMSBuild="true">

     

       22
       22
       -
       -            <Output TaskParameter="ConsoleOutput" PropertyName="GitInfoCommitHash" />

     

       23
       23
       -
       -        </Exec>

     

       24
       24
       -
                <Message Text="Building $(Product): $(GitInfoCommitHash) --- $(PackageRuntime)" Importance="high"/>

     

       25
       25
       -
        

     

       26
       26
       -
                <ItemGroup>

     

       27
       27
       -
       @@ -41,14 +38,13 @@

     

       28
       28
       -
            </ItemGroup>

     

       29
       29
       -
        

     

       30
       30
       -
            <Target Name="Build" DependsOnTargets="GenerateConstant">

     

       31
       31
       -
       -        <MSBuild Targets="Restore" Projects="@(ProjectFiles)" StopOnFirstFailure="true" />

     

       32
       32
       -
                <MSBuild Targets="Publish" Projects="@(ProjectFiles)" BuildInParallel="false" StopOnFirstFailure="true" Properties="Configuration=$(BUILDCONFIG);PackageRuntime=$(PackageRuntime);Version=$(RunnerVersion);RuntimeIdentifier=$(PackageRuntime);PublishDir=$(MSBuildProjectDirectory)/../_layout/bin" />

     

       33
       33
       -
                <Exec Command="%22$(DesktopMSBuild)%22 Runner.Service/Windows/RunnerService.csproj /p:Configuration=$(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime) /p:OutputPath=%22$(MSBuildProjectDirectory)/../_layout/bin%22" ConsoleToMSBuild="true" Condition="'$(PackageRuntime)' == 'win-x64' Or '$(PackageRuntime)' == 'win-x86' Or '$(PackageRuntime)' == 'win-arm64'" />

     

       34
       34
       -
            </Target>

     

       35
       35
       -
        

     

       36
       36
       -
            <Target Name="Test" DependsOnTargets="GenerateConstant">

     

       37
       37
       -
       -        <Exec Command="dotnet build Test/Test.csproj -c $(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime)" ConsoleToMSBuild="true" />

     

       38
       38
       -
       -        <Exec Command="dotnet test Test/Test.csproj -c $(BUILDCONFIG) --no-build --logger:trx" ConsoleToMSBuild="true" />

     

       39
       39
       -
       +        <Exec Command="dotnet build Test/Test.csproj --no-restore -c $(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime)" ConsoleToMSBuild="true" />

     

       40
       40
       -
       +        <Exec Command="dotnet test Test/Test.csproj --no-restore -c $(BUILDCONFIG) --no-build --logger:trx" ConsoleToMSBuild="true" />

     

       41
       41
       -
            </Target>

     

       42
       42
       -
        

     

       43
       43
       -
            <Target Name="Layout" DependsOnTargets="Clean;Build">

     

       44
       44
       -
       -- 

     

       45
       45
       -
       2.36.2

+28

pkgs/development/tools/continuous-integration/github-runner/patches/dont-install-service.patch

···

       1
       1
       +
       From 369b3d98b44abbf061080ab1b17b22f99706ef69 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Vincent Haupert <mail@vincent-haupert.de>

     

       3
       3
       +
       Date: Sun, 26 Feb 2023 12:55:38 +0100

     

       4
       4
       +
       Subject: [PATCH] Don't generate service config on Linux and OSX

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        src/Runner.Listener/Configuration/ConfigurationManager.cs | 5 -----

     

       8
       8
       +
        1 file changed, 5 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/src/Runner.Listener/Configuration/ConfigurationManager.cs b/src/Runner.Listener/Configuration/ConfigurationManager.cs

     

       11
       11
       +
       index 392eb0e..4c75324 100644

     

       12
       12
       +
       --- a/src/Runner.Listener/Configuration/ConfigurationManager.cs

     

       13
       13
       +
       +++ b/src/Runner.Listener/Configuration/ConfigurationManager.cs

     

       14
       14
       +
       @@ -367,11 +367,6 @@ namespace GitHub.Runner.Listener.Configuration

     

       15
       15
       +
                        var serviceControlManager = HostContext.GetService<IWindowsServiceControlManager>();

     

       16
       16
       +
                        serviceControlManager.ConfigureService(runnerSettings, command);

     

       17
       17
       +
                    }

     

       18
       18
       +
       -

     

       19
       19
       +
       -#elif OS_LINUX || OS_OSX

     

       20
       20
       +
       -            // generate service config script for OSX and Linux, GenerateScripts() will no-opt on windows.

     

       21
       21
       +
       -            var serviceControlManager = HostContext.GetService<ILinuxServiceControlManager>();

     

       22
       22
       +
       -            serviceControlManager.GenerateScripts(runnerSettings);

     

       23
       23
       +
        #endif

     

       24
       24
       +
                }

     

       25
       25
       +
        

     

       26
       26
       +
       -- 

     

       27
       27
       +
       2.38.1

     

       28
       28
       +

-15

pkgs/development/tools/continuous-integration/github-runner/patches/dont-install-systemd-service.patch

···

       1
       1
       -
       diff --git a/src/Runner.Listener/Configuration/ConfigurationManager.cs b/src/Runner.Listener/Configuration/ConfigurationManager.cs

     

       2
       2
       -
       index 8d08b06..bdfa3a2 100644

     

       3
       3
       -
       --- a/src/Runner.Listener/Configuration/ConfigurationManager.cs

     

       4
       4
       -
       +++ b/src/Runner.Listener/Configuration/ConfigurationManager.cs

     

       5
       5
       -
       @@ -320,10 +320,6 @@ namespace GitHub.Runner.Listener.Configuration

     

       6
       6
       -
                        serviceControlManager.ConfigureService(runnerSettings, command);

     

       7
       7
       -
                    }

     

       8
       8
       -
        

     

       9
       9
       -
       -#elif OS_LINUX || OS_OSX

     

       10
       10
       -
       -            // generate service config script for OSX and Linux, GenerateScripts() will no-opt on windows.

     

       11
       11
       -
       -            var serviceControlManager = HostContext.GetService<ILinuxServiceControlManager>();

     

       12
       12
       -
       -            serviceControlManager.GenerateScripts(runnerSettings);

     

       13
       13
       -
        #endif

     

       14
       14
       -
                }

     

       15
       15
       -

+76

pkgs/development/tools/continuous-integration/github-runner/patches/env-sh-use-runner-root.patch

···

       1
       1
       +
       From 84b2fcdf042771ae8adc0f59f1a3ecd9788a808d Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Vincent Haupert <mail@vincent-haupert.de>

     

       3
       3
       +
       Date: Sun, 26 Feb 2023 11:37:01 +0100

     

       4
       4
       +
       Subject: [PATCH] Access `.env` and `.path` relative to `$RUNNER_ROOT`, if set

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        src/Misc/layoutbin/runsvc.sh   |  4 ++--

     

       8
       8
       +
        src/Misc/layoutroot/env.sh     | 10 +++++-----

     

       9
       9
       +
        src/Runner.Listener/Program.cs |  2 +-

     

       10
       10
       +
        3 files changed, 8 insertions(+), 8 deletions(-)

     

       11
       11
       +
       

     

       12
       12
       +
       diff --git a/src/Misc/layoutbin/runsvc.sh b/src/Misc/layoutbin/runsvc.sh

     

       13
       13
       +
       index c135645..bb0fbf6 100755

     

       14
       14
       +
       --- a/src/Misc/layoutbin/runsvc.sh

     

       15
       15
       +
       +++ b/src/Misc/layoutbin/runsvc.sh

     

       16
       16
       +
       @@ -4,9 +4,9 @@

     

       17
       17
       +
        # for more info on how to propagate SIGTERM to a child process see: http://veithen.github.io/2014/11/16/sigterm-propagation.html

     

       18
       18
       +
        trap 'kill -INT $PID' TERM INT

     

       19
       19
       +
        

     

       20
       20
       +
       -if [ -f ".path" ]; then

     

       21
       21
       +
       +if [ -f "${RUNNER_ROOT:-"."}/.path" ]; then

     

       22
       22
       +
            # configure

     

       23
       23
       +
       -    export PATH=`cat .path`

     

       24
       24
       +
       +    export PATH=`cat "${RUNNER_ROOT:-"."}/.path"`

     

       25
       25
       +
            echo ".path=${PATH}"

     

       26
       26
       +
        fi

     

       27
       27
       +
        

     

       28
       28
       +
       diff --git a/src/Misc/layoutroot/env.sh b/src/Misc/layoutroot/env.sh

     

       29
       29
       +
       index 641d244..85379bf 100755

     

       30
       30
       +
       --- a/src/Misc/layoutroot/env.sh

     

       31
       31
       +
       +++ b/src/Misc/layoutroot/env.sh

     

       32
       32
       +
       @@ -16,10 +16,10 @@ varCheckList=(

     

       33
       33
       +
        

     

       34
       34
       +
        envContents=""

     

       35
       35
       +
        

     

       36
       36
       +
       -if [ -f ".env" ]; then

     

       37
       37
       +
       -    envContents=`cat .env`

     

       38
       38
       +
       +if [ -f "${RUNNER_ROOT:-"."}/.env" ]; then

     

       39
       39
       +
       +    envContents=`cat "${RUNNER_ROOT:-"."}/.env"`

     

       40
       40
       +
        else

     

       41
       41
       +
       -    touch .env

     

       42
       42
       +
       +    touch "${RUNNER_ROOT:-"."}/.env"

     

       43
       43
       +
        fi

     

       44
       44
       +
        

     

       45
       45
       +
        function writeVar()

     

       46
       46
       +
       @@ -29,12 +29,12 @@ function writeVar()

     

       47
       47
       +
            if test "${envContents#*$checkDelim}" = "$envContents"

     

       48
       48
       +
            then

     

       49
       49
       +
                if [ ! -z "${!checkVar}" ]; then

     

       50
       50
       +
       -            echo "${checkVar}=${!checkVar}">>.env

     

       51
       51
       +
       +            echo "${checkVar}=${!checkVar}">>"${RUNNER_ROOT:-"."}/.env"

     

       52
       52
       +
                fi

     

       53
       53
       +
            fi 

     

       54
       54
       +
        }

     

       55
       55
       +
        

     

       56
       56
       +
       -echo $PATH>.path

     

       57
       57
       +
       +echo $PATH>"${RUNNER_ROOT:-"."}/.path"

     

       58
       58
       +
        

     

       59
       59
       +
        for var_name in ${varCheckList[@]}

     

       60
       60
       +
        do

     

       61
       61
       +
       diff --git a/src/Runner.Listener/Program.cs b/src/Runner.Listener/Program.cs

     

       62
       62
       +
       index d4d5e43..beacc9d 100644

     

       63
       63
       +
       --- a/src/Runner.Listener/Program.cs

     

       64
       64
       +
       +++ b/src/Runner.Listener/Program.cs

     

       65
       65
       +
       @@ -148,7 +148,7 @@ namespace GitHub.Runner.Listener

     

       66
       66
       +
                private static void LoadAndSetEnv()

     

       67
       67
       +
                {

     

       68
       68
       +
                    var binDir = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);

     

       69
       69
       +
       -            var rootDir = new DirectoryInfo(binDir).Parent.FullName;

     

       70
       70
       +
       +            var rootDir = Environment.GetEnvironmentVariable("RUNNER_ROOT") ?? new DirectoryInfo(binDir).Parent.FullName;

     

       71
       71
       +
                    string envFile = Path.Combine(rootDir, ".env");

     

       72
       72
       +
                    if (File.Exists(envFile))

     

       73
       73
       +
                    {

     

       74
       74
       +
       -- 

     

       75
       75
       +
       2.38.1

     

       76
       76
       +

+19

pkgs/development/tools/continuous-integration/github-runner/update.sh

···

       1
       1
       +
       #! /usr/bin/env nix-shell

     

       2
       2
       +
       #! nix-shell -I nixpkgs=./. -i bash -p coreutils common-updater-scripts jq curl

     

       3
       3
       +
       

     

       4
       4
       +
       set -euo pipefail

     

       5
       5
       +
       

     

       6
       6
       +
       currentVersion="$(nix --extra-experimental-features nix-command eval -f . github-runner.version --raw)"

     

       7
       7
       +
       latestVersion="$(curl -s -H "Accept: application/vnd.github.v3+json" \

     

       8
       8
       +
                   ${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \

     

       9
       9
       +
                   "https://api.github.com/repos/actions/runner/releases/latest" | jq -r ".tag_name")"

     

       10
       10
       +
       latestVersion="${latestVersion#?}" # v2.296.2 -> 2.296.2

     

       11
       11
       +
       

     

       12
       12
       +
       if [[ "$latestVersion" == "$currentVersion" ]]; then

     

       13
       13
       +
           echo "github-runner is already up to date: $currentVersion"

     

       14
       14
       +
           exit

     

       15
       15
       +
       fi

     

       16
       16
       +
       

     

       17
       17
       +
       update-source-version github-runner "$latestVersion"

     

       18
       18
       +
       $(nix-build -A github-runner.fetch-deps --no-out-link) "$(dirname "$BASH_SOURCE")/deps.nix"

     

       19
       19
       +