Skip to content

Commit 04699d2

Browse files
authored
Merge pull request #6757 from k0sproject/renovate/main-go-1.x
Bump go to v1.25.5
2 parents 62fed16 + 3743d3d commit 04699d2

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM $BUILDIMAGE
44
ARG TARGETARCH
55
RUN set -ex; \
66
# Need to use the gold linker on ARM, Go really wants to have it.
7-
# https://github.com/golang/go/blob/go1.25.4/src/cmd/link/internal/ld/lib.go#L1678-L1697
7+
# https://github.com/golang/go/blob/go1.25.5/src/cmd/link/internal/ld/lib.go#L1678-L1697
88
case "$TARGETARCH" in \
99
arm*) binutils=binutils-gold ;; \
1010
*) binutils=binutils ;; \

embedded-bins/Makefile.variables

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ alpine_patch_version = 3.22.2
33
alpine_version = $(word 1,$(subst ., ,$(alpine_patch_version))).$(word 2,$(subst ., ,$(alpine_patch_version)))
44

55
# renovate: datasource=golang-version depName=go
6-
go_version = 1.25.4
6+
go_version = 1.25.5
77
golang_buildimage=docker.io/library/golang:$(go_version)-alpine$(alpine_version)
88

99
# renovate: datasource=github-releases depName=opencontainers/runc

internal/pkg/file/atomic_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func TestWriteAtomically(t *testing.T) {
215215
)
216216
assert.Equal(t, file, linkErr.New)
217217
if runtime.GOOS == "windows" {
218-
// https://github.com/golang/go/blob/go1.25.4/src/syscall/types_windows.go#L13
218+
// https://github.com/golang/go/blob/go1.25.5/src/syscall/types_windows.go#L13
219219
//revive:disable-next-line:var-naming
220220
const ERROR_ACCESS_DENIED syscall.Errno = 5
221221
var errno syscall.Errno

0 commit comments

Comments
 (0)