Skip to content

Commit 33e6e41

Browse files
committed
fix github actions workflow
1 parent b2d7f73 commit 33e6e41

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/build-x86-image.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172
path: |
173173
~/.cache/go-build
174174
~/go/pkg/mod
175-
key: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-${{ hashFiles('${{ env.E2E_DIR }}/**/go.sum') }}
175+
key: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
176176
restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-
177177

178178
- name: Build e2e binaries
@@ -207,7 +207,7 @@ jobs:
207207
- name: Run E2E
208208
working-directory: ${{ env.E2E_DIR }}
209209
env:
210-
E2E_BRANCH: ${{ matrix.branch }}
210+
E2E_BRANCH: ${{ github.base_ref || github.ref_name }}
211211
E2E_IP_FAMILY: ${{ matrix.ip-family }}
212212
E2E_NETWORK_MODE: ${{ matrix.mode }}
213213
run: make k8s-conformance-e2e
@@ -265,7 +265,7 @@ jobs:
265265
path: |
266266
~/.cache/go-build
267267
~/go/pkg/mod
268-
key: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-${{ hashFiles('${{ env.E2E_DIR }}/**/go.sum') }}
268+
key: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
269269
restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-
270270

271271
- name: Build e2e binaries
@@ -414,7 +414,7 @@ jobs:
414414
path: |
415415
~/.cache/go-build
416416
~/go/pkg/mod
417-
key: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-${{ hashFiles('${{ env.E2E_DIR }}/**/go.sum') }}
417+
key: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
418418
restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-
419419

420420
- name: Build e2e binaries
@@ -495,7 +495,7 @@ jobs:
495495
path: |
496496
~/.cache/go-build
497497
~/go/pkg/mod
498-
key: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-${{ hashFiles('${{ env.E2E_DIR }}/**/go.sum') }}
498+
key: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
499499
restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-
500500

501501
- name: Build e2e binaries
@@ -764,7 +764,7 @@ jobs:
764764
path: |
765765
~/.cache/go-build
766766
~/go/pkg/mod
767-
key: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-${{ hashFiles('${{ env.E2E_DIR }}/**/go.sum') }}
767+
key: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
768768
restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-
769769

770770
- name: Build e2e binaries
@@ -857,7 +857,7 @@ jobs:
857857
path: |
858858
~/.cache/go-build
859859
~/go/pkg/mod
860-
key: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-${{ hashFiles('${{ env.E2E_DIR }}/**/go.sum') }}
860+
key: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
861861
restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86-
862862

863863
- name: Build e2e binaries

0 commit comments

Comments
 (0)