diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2022-12-19 13:18:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 13:18:16 -0500 |
| commit | ba86945ee00a5c046f68451c1db279ea5e2bc797 (patch) | |
| tree | fb7213d9bf6951995f3f4723faec96f3b6b61acf | |
| parent | Merge pull request #206879 from NixOS/backport-204725-to-release-22.11 (diff) | |
| parent | github-runner: 2.299.1 -> 2.300.0 (diff) | |
| download | nixpkgs-ba86945ee00a5c046f68451c1db279ea5e2bc797.tar.gz | |
Merge pull request #206142 from NixOS/backport-206107-to-release-22.11
[Backport release-22.11] github-runner: 2.299.1 -> 2.300.0
| -rw-r--r-- | pkgs/development/tools/continuous-integration/github-runner/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/continuous-integration/github-runner/patches/use-get-directory-for-diag.patch | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 8c129d5ff18a..3a4f0de8170f 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -49,7 +49,7 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.299.1"; + version = "2.300.0"; inherit sdkSource; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-o6N7GDfSEWX6QaEga5hQpbpDcBh7Alcy9mK3QlODTbs="; + hash = "sha256-pEBudX285qMz0W8Sog0ph2CA5UclBItQ+ixaBi6dl8I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/use-get-directory-for-diag.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/use-get-directory-for-diag.patch index ff91bcff158c..2581cb7bb921 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/patches/use-get-directory-for-diag.patch +++ b/pkgs/development/tools/continuous-integration/github-runner/patches/use-get-directory-for-diag.patch @@ -1,17 +1,17 @@ diff --git a/src/Runner.Common/HostContext.cs b/src/Runner.Common/HostContext.cs -index d4ea48c..15c1800 100644 +index 9e43464..a953694 100644 --- a/src/Runner.Common/HostContext.cs +++ b/src/Runner.Common/HostContext.cs -@@ -109,7 +109,7 @@ namespace GitHub.Runner.Common +@@ -119,7 +119,7 @@ namespace GitHub.Runner.Common } // this should give us _diag folder under runner root directory - string diagLogDirectory = Path.Combine(new DirectoryInfo(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)).Parent.FullName, Constants.Path.DiagDirectory); + string diagLogDirectory = GetDirectory(WellKnownDirectory.Diag); - _traceManager = new TraceManager(new HostTraceListener(diagLogDirectory, hostType, logPageSize, logRetentionDays), this.SecretMasker); + _traceManager = new TraceManager(new HostTraceListener(diagLogDirectory, hostType, logPageSize, logRetentionDays), stdoutTraceListener, this.SecretMasker); } else -@@ -272,7 +272,10 @@ namespace GitHub.Runner.Common +@@ -297,7 +297,10 @@ namespace GitHub.Runner.Common throw new NotSupportedException($"Unexpected well known directory: '{directory}'"); } |