Skip to content

Commit a77b2de

Browse files
authored
Merge pull request #136 from jglick/x-sys
Bump `x/sys` package
2 parents 3a05730 + 5073523 commit a77b2de

5 files changed

Lines changed: 11 additions & 10 deletions

File tree

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
3+
go 1.24.0
44

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

77
require (
8-
golang.org/x/sys v0.7.0
8+
golang.org/x/sys v0.38.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.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
2-
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
2+
golang.org/x/sys v0.38.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
3+
go 1.24.0
44

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

77
require (
8-
golang.org/x/sys v0.7.0
8+
golang.org/x/sys v0.38.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.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
2-
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
2+
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=

src/docker/windows/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ WORKDIR $BASE_DIR/cmd/bash
1313
# see golang.org/issue/31481
1414
# RUN go mod tidy
1515
RUN go get -modcacherw jenkinsci.org/plugins/durabletask/common
16-
RUN go get -modcacherw golang.org/x/sys@v0.7.0
16+
# 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
1718
# can't test bash on windows
1819
RUN set CGO_ENABLED=0&& set GOOS=darwin&& set GOARCH=amd64&& go build -a -ldflags="-s -w" -trimpath -o %NAME%_darwin_amd64
1920
RUN set CGO_ENABLED=0&& set GOOS=darwin&& set GOARCH=arm64&& go build -a -ldflags="-s -w" -trimpath -o %NAME%_darwin_arm64
@@ -24,7 +25,7 @@ RUN set CGO_ENABLED=0&& set GOOS=linux&& set GOARCH=arm64&& go build -a -ldflags
2425
WORKDIR $BASE_DIR/cmd/windows
2526
# RUN go mod tidy
2627
RUN go get -modcacherw jenkinsci.org/plugins/durabletask/common
27-
RUN go get -modcacherw golang.org/x/sys@v0.7.0
28+
RUN go get -modcacherw golang.org/x/sys@v0.38.0
2829
RUN go test -v
2930
RUN set CGO_ENABLED=0& set GOOS=windows& set GOARCH=amd64& go build -a -ldflags="-s -w" -trimpath -o %NAME%_win_64.exe
3031
RUN set CGO_ENABLED=0& set GOOS=windows& set GOARCH=386& go build -a -ldflags="-s -w" -trimpath -o %NAME%_win_32.exe

0 commit comments

Comments
 (0)