From 6fe77225aeffea2279ef7c1b5a4e67598d7fdc70 Mon Sep 17 00:00:00 2001 From: Andrew Stoltz Date: Sun, 17 May 2026 21:53:05 -0500 Subject: [PATCH] fix(github-runner): dedupe DOTNET_INSTALL_DIR+NUGET_PACKAGES on base+sharedpos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR #5 rebase concatenated PR #5 env additions onto PR #7 env additions on the base + sharedpos Deployments, producing duplicate-key validation errors in ArgoCD's structured merge. The DOTNET_INSTALL_DIR and NUGET_PACKAGES values are identical between PR #5 and PR #7; keep the PR #7 originals and retain only the unique new env vars from PR #5 (DOTNET_CLI_TELEMETRY_OPTOUT, DOTNET_NOLOGO, DOTNET_GENERATE_ASPNET_CERTIFICATE). No behavioral change — same final env var set, no duplicates. --- apps/github-runner/github-runner.yaml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/apps/github-runner/github-runner.yaml b/apps/github-runner/github-runner.yaml index 85b4e30..09a6e75 100644 --- a/apps/github-runner/github-runner.yaml +++ b/apps/github-runner/github-runner.yaml @@ -215,17 +215,13 @@ spec: - name: RUN_AS_ROOT value: "false" # Sprint 30 Cl-1 pod-env fix (2026-05-21): retire the per-workflow - # DOTNET_INSTALL_DIR patch by setting it (+ siblings) here so ALL - # flipped Linux repos pick it up automatically. setup-dotnet@v4 - # default writes to /usr/share/dotnet (root-only) or HOME-relative - # ~/.dotnet without HOME guard; pin both explicitly to the chowned - # emptyDir at /home/runner. - - name: DOTNET_INSTALL_DIR - value: "/home/runner/.dotnet" + # DOTNET_INSTALL_DIR patch by setting siblings here so ALL flipped + # Linux repos pick them up automatically. setup-dotnet@v4 default + # writes to /usr/share/dotnet (root-only) or HOME-relative ~/.dotnet + # without HOME guard; the DOTNET_INSTALL_DIR + NUGET_PACKAGES pins + # above already point at the chowned emptyDir at /home/runner. - name: DOTNET_CLI_TELEMETRY_OPTOUT value: "1" - - name: NUGET_PACKAGES - value: "/home/runner/.nuget/packages" - name: DOTNET_NOLOGO value: "1" - name: DOTNET_GENERATE_ASPNET_CERTIFICATE @@ -375,12 +371,9 @@ spec: - name: RUN_AS_ROOT value: "false" # Sprint 30 Cl-1 pod-env fix (2026-05-21): retire per-workflow patch. - - name: DOTNET_INSTALL_DIR - value: "/home/runner/.dotnet" + # DOTNET_INSTALL_DIR + NUGET_PACKAGES already pinned above. - name: DOTNET_CLI_TELEMETRY_OPTOUT value: "1" - - name: NUGET_PACKAGES - value: "/home/runner/.nuget/packages" - name: DOTNET_NOLOGO value: "1" - name: DOTNET_GENERATE_ASPNET_CERTIFICATE