bluejay/bluejay-infra
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases Wiki Activity

fix(github-runner): dedupe DOTNET_INSTALL_DIR+NUGET_PACKAGES on base+sharedpos

Browse Source 
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.
This commit is contained in:
Andrew Stoltz
2026-05-17 21:53:05 -05:00
parent 634b9c4169
commit 6fe77225ae
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/github-runner/github-runner.yaml
View File

@@ -215,17 +215,13 @@ spec:
- name: RUN_AS_ROOT - name: RUN_AS_ROOT
value: "false" value: "false"
# Sprint 30 Cl-1 pod-env fix (2026-05-21): retire the per-workflow # 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 # DOTNET_INSTALL_DIR patch by setting siblings here so ALL flipped
# flipped Linux repos pick it up automatically. setup-dotnet@v4 # Linux repos pick them up automatically. setup-dotnet@v4 default
# default writes to /usr/share/dotnet (root-only) or HOME-relative # writes to /usr/share/dotnet (root-only) or HOME-relative ~/.dotnet
# ~/.dotnet without HOME guard; pin both explicitly to the chowned # without HOME guard; the DOTNET_INSTALL_DIR + NUGET_PACKAGES pins
# emptyDir at /home/runner. # above already point at the chowned emptyDir at /home/runner.
- name: DOTNET_INSTALL_DIR
value: "/home/runner/.dotnet"
- name: DOTNET_CLI_TELEMETRY_OPTOUT - name: DOTNET_CLI_TELEMETRY_OPTOUT
value: "1" value: "1"
- name: NUGET_PACKAGES
value: "/home/runner/.nuget/packages"
- name: DOTNET_NOLOGO - name: DOTNET_NOLOGO
value: "1" value: "1"
- name: DOTNET_GENERATE_ASPNET_CERTIFICATE - name: DOTNET_GENERATE_ASPNET_CERTIFICATE
@@ -375,12 +371,9 @@ spec:
- name: RUN_AS_ROOT - name: RUN_AS_ROOT
value: "false" value: "false"
# Sprint 30 Cl-1 pod-env fix (2026-05-21): retire per-workflow patch. # Sprint 30 Cl-1 pod-env fix (2026-05-21): retire per-workflow patch.
- name: DOTNET_INSTALL_DIR # DOTNET_INSTALL_DIR + NUGET_PACKAGES already pinned above.
value: "/home/runner/.dotnet"
- name: DOTNET_CLI_TELEMETRY_OPTOUT - name: DOTNET_CLI_TELEMETRY_OPTOUT
value: "1" value: "1"
- name: NUGET_PACKAGES
value: "/home/runner/.nuget/packages"
- name: DOTNET_NOLOGO - name: DOTNET_NOLOGO
value: "1" value: "1"
- name: DOTNET_GENERATE_ASPNET_CERTIFICATE - name: DOTNET_GENERATE_ASPNET_CERTIFICATE