Skip to content

Commit 1329501

Browse files
authored
Merge pull request #151 from daniel-beck/go1.26
Update go and dependencies
2 parents a77b2de + ea071fe commit 1329501

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

src/cmd/bash/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module jenkinsci.org/plugins/durabletask/bash
22

3-
go 1.24.0
3+
go 1.26
44

55
replace jenkinsci.org/plugins/durabletask/common => ../../pkg/common
66

77
require (
8-
golang.org/x/sys v0.38.0
8+
golang.org/x/sys v0.41.0
99
jenkinsci.org/plugins/durabletask/common v0.0.0-00010101000000-000000000000
1010
)

src/cmd/bash/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
2-
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
1+
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
2+
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=

src/cmd/windows/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module jenkinsci.org/plugins/durabletask/windows
22

3-
go 1.24.0
3+
go 1.26
44

55
replace jenkinsci.org/plugins/durabletask/common => ../../pkg/common
66

77
require (
8-
golang.org/x/sys v0.38.0
8+
golang.org/x/sys v0.41.0
99
jenkinsci.org/plugins/durabletask/common v0.0.0-00010101000000-000000000000
1010
)

src/cmd/windows/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
2-
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
1+
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
2+
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=

src/docker/linux/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG BASE_DIR=/durabletask
22
ARG NAME=durable_task_monitor
33

4-
FROM golang:1.25.5-bookworm AS builder
4+
FROM golang:1.26.0-bookworm AS builder
55
ARG BASE_DIR
66
ARG NAME
77
COPY cmd $BASE_DIR/cmd

src/docker/windows/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG BASE_DIR=/durabletask
22
ARG NAME=durable_task_monitor
33

4-
FROM golang:1.24.3-nanoserver-1809 AS builder
4+
FROM golang:1.26.0-nanoserver AS builder
55
ARG BASE_DIR
66
ARG NAME
77
COPY cmd $BASE_DIR/cmd
@@ -14,7 +14,7 @@ WORKDIR $BASE_DIR/cmd/bash
1414
# RUN go mod tidy
1515
RUN go get -modcacherw jenkinsci.org/plugins/durabletask/common
1616
# TODO find some way to inject specific version of x/sys based on go.mod definitions
17-
RUN go get -modcacherw golang.org/x/sys@v0.38.0
17+
RUN go get -modcacherw golang.org/x/sys@v0.41.0
1818
# can't test bash on windows
1919
RUN set CGO_ENABLED=0&& set GOOS=darwin&& set GOARCH=amd64&& go build -a -ldflags="-s -w" -trimpath -o %NAME%_darwin_amd64
2020
RUN set CGO_ENABLED=0&& set GOOS=darwin&& set GOARCH=arm64&& go build -a -ldflags="-s -w" -trimpath -o %NAME%_darwin_arm64
@@ -25,7 +25,7 @@ RUN set CGO_ENABLED=0&& set GOOS=linux&& set GOARCH=arm64&& go build -a -ldflags
2525
WORKDIR $BASE_DIR/cmd/windows
2626
# RUN go mod tidy
2727
RUN go get -modcacherw jenkinsci.org/plugins/durabletask/common
28-
RUN go get -modcacherw golang.org/x/sys@v0.38.0
28+
RUN go get -modcacherw golang.org/x/sys@v0.41.0
2929
RUN go test -v
3030
RUN set CGO_ENABLED=0& set GOOS=windows& set GOARCH=amd64& go build -a -ldflags="-s -w" -trimpath -o %NAME%_win_64.exe
3131
RUN set CGO_ENABLED=0& set GOOS=windows& set GOARCH=386& go build -a -ldflags="-s -w" -trimpath -o %NAME%_win_32.exe

src/pkg/common/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module jenkinsci.org/plugins/durabletask/common
22

3-
go 1.24
3+
go 1.26

0 commit comments

Comments
 (0)