diff --git a/.github/workflows/daily-news.lock.yml b/.github/workflows/daily-news.lock.yml index 4da3a35be8b..44b9ce31bc3 100644 --- a/.github/workflows/daily-news.lock.yml +++ b/.github/workflows/daily-news.lock.yml @@ -1022,9 +1022,7 @@ jobs: GH_AW_TOOL_CACHE_MOUNT="" GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:-/opt/hostedtoolcache}" if [ -d "$GH_AW_TOOL_CACHE" ]; then - if [[ "$GH_AW_TOOL_CACHE" != /opt/* ]]; then - GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro" - fi + GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro" elif [ -d "/home/runner/work/_tool" ]; then GH_AW_TOOL_CACHE_MOUNT="/home/runner/work/_tool:/home/runner/work/_tool:ro" fi @@ -1622,9 +1620,7 @@ jobs: GH_AW_TOOL_CACHE_MOUNT="" GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:-/opt/hostedtoolcache}" if [ -d "$GH_AW_TOOL_CACHE" ]; then - if [[ "$GH_AW_TOOL_CACHE" != /opt/* ]]; then - GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro" - fi + GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro" elif [ -d "/home/runner/work/_tool" ]; then GH_AW_TOOL_CACHE_MOUNT="/home/runner/work/_tool:/home/runner/work/_tool:ro" fi @@ -2151,4 +2147,3 @@ jobs: actions/setup sparse-checkout-cone-mode: true persist-credentials: false - diff --git a/pkg/workflow/awf_config_test.go b/pkg/workflow/awf_config_test.go index 40c04aa6276..e5d26d1c77f 100644 --- a/pkg/workflow/awf_config_test.go +++ b/pkg/workflow/awf_config_test.go @@ -1174,7 +1174,8 @@ func TestBuildAWFCommand_AddsToolCacheMountProbe(t *testing.T) { command := BuildAWFCommand(config) assert.Contains(t, command, `GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:-/opt/hostedtoolcache}"`, "should detect RUNNER_TOOL_CACHE with hostedtoolcache fallback") - assert.Contains(t, command, `GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro"`, "should mount non-/opt tool cache paths") + assert.Contains(t, command, `GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro"`, "should mount detected tool cache path") + assert.NotContains(t, command, `if [[ "$GH_AW_TOOL_CACHE" != /opt/* ]]; then`, "should not skip /opt tool cache paths") assert.Contains(t, command, `GH_AW_TOOL_CACHE_MOUNT="/home/runner/work/_tool:/home/runner/work/_tool:ro"`, "should include fallback mount for legacy _tool path") assert.Contains(t, command, `${GH_AW_TOOL_CACHE_MOUNT:+--mount "$GH_AW_TOOL_CACHE_MOUNT"}`, "should inject tool-cache mount args into awf invocation") } diff --git a/pkg/workflow/awf_helpers.go b/pkg/workflow/awf_helpers.go index 7c02c49c0d4..df79d3bff52 100644 --- a/pkg/workflow/awf_helpers.go +++ b/pkg/workflow/awf_helpers.go @@ -202,9 +202,7 @@ fi`, toolCacheMountProbe := fmt.Sprintf(`%s="" GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:-/opt/hostedtoolcache}" if [ -d "$GH_AW_TOOL_CACHE" ]; then - if [[ "$GH_AW_TOOL_CACHE" != /opt/* ]]; then - %s="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro" - fi + %s="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro" elif [ -d "/home/runner/work/_tool" ]; then %s="/home/runner/work/_tool:/home/runner/work/_tool:ro" fi`,