Skip to content

Commit ba82741

Browse files
authored
Merge pull request #21 from embik/update-build-image
Update to latest 1.23 build image
2 parents 239f65d + 156b617 commit ba82741

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.prow.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ presubmits:
2121
preset-goproxy: "true"
2222
spec:
2323
containers:
24-
- image: ghcr.io/kcp-dev/infra/build:1.23.5-1
24+
- image: ghcr.io/kcp-dev/infra/build:1.23.9-1
2525
command:
2626
- make
2727
- verify
@@ -38,7 +38,7 @@ presubmits:
3838
preset-goproxy: "true"
3939
spec:
4040
containers:
41-
- image: ghcr.io/kcp-dev/infra/build:1.23.5-1
41+
- image: ghcr.io/kcp-dev/infra/build:1.23.9-1
4242
command:
4343
- make
4444
- lint
@@ -55,7 +55,7 @@ presubmits:
5555
preset-goproxy: "true"
5656
spec:
5757
containers:
58-
- image: ghcr.io/kcp-dev/infra/build:1.23.5-1
58+
- image: ghcr.io/kcp-dev/infra/build:1.23.9-1
5959
command:
6060
- make
6161
- test

Makefile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,19 @@ $(GOLANGCI_LINT):
3737
golangci-lint \
3838
${GOLANGCI_LINT_VERSION}
3939

40+
# wwhrd is installed as a Go module rather than from the provided
41+
# binaries because there is no arm64 binary available from the author.
42+
# See https://github.com/frapposelli/wwhrd/issues/141
43+
4044
WWHRD = _tools/wwhrd
41-
WWHRD_VERSION = 0.4.0
45+
WWHRD_VERSION = 06b99400ca6db678386ba5dc39bbbdcdadb664ff
4246

4347
.PHONY: $(WWHRD)
4448
$(WWHRD):
45-
@hack/download-tool.sh \
46-
https://github.com/frapposelli/wwhrd/releases/download/v${WWHRD_VERSION}/wwhrd_${WWHRD_VERSION}_${GOOS}_${GOARCH}.tar.gz \
49+
@GO_MODULE=true hack/download-tool.sh \
50+
github.com/frapposelli/wwhrd \
4751
wwhrd \
48-
${WWHRD_VERSION} \
49-
wwhrd
52+
${WWHRD_VERSION}
5053

5154
BOILERPLATE = _tools/boilerplate
5255
BOILERPLATE_VERSION = 0.3.0

0 commit comments

Comments
 (0)