Skip to content

Commit 8eb115a

Browse files
committed
Fix install-go cache key
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
1 parent 4912f3c commit 8eb115a

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

.github/actions/setup-go/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ runs:
3939
${{ env.GO_MODCACHE }}
4040
${{ env.GO_CACHE }}
4141
# Match the cache key to the setup-go action https://github.com/actions/setup-go/blob/main/src/cache-restore.ts#L34
42-
key: setup-go-${{ runner.os }}-${{ env.ImageOS }}-go-${{ env.GO_VERSION }}-${{ hashFiles('go.sum') }}
42+
key: setup-go-${{ runner.os }}-${{ env.IMAGE_OS }}-go-${{ env.GO_VERSION }}-${{ hashFiles('go.sum') }}
4343
restore-keys: |
44-
setup-go-${{ runner.os }}-
44+
setup-go-${{ runner.os }}-${{ env.IMAGE_OS }}-go-${{ env.GO_VERSION }}-

.github/workflows/e2e.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ jobs:
102102
run: vagrant plugin install vagrant-k3s vagrant-reload vagrant-scp
103103
- name: Install Go
104104
uses: ./.github/actions/setup-go
105+
env:
106+
IMAGE_OS: ${{ env.IMAGE_OS }}
105107
- name: Install Kubectl
106108
run: |
107109
STABLE_VERSION=$(yq '.channels[] | select(.name == "stable") | .latest | sub("\+.*", "")' channel.yaml)

0 commit comments

Comments
 (0)