Skip to content

Commit bb31a80

Browse files
authored
Merge pull request #6554 from thaJeztah/bump_goversioninfo
Dockerfile: bump github.com/josephspurrier/goversioninfo to v1.5.0
2 parents 8ecdfed + c2817e2 commit bb31a80

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ ARG GO_VERSION=1.24.8
1313
# XX_VERSION specifies the version of the xx utility to use.
1414
# It must be a valid tag in the docker.io/tonistiigi/xx image repository.
1515
ARG XX_VERSION=1.7.0
16-
ARG GOVERSIONINFO_VERSION=v1.4.1
16+
17+
# GOVERSIONINFO_VERSION is the version of GoVersionInfo to install.
18+
# It must be a valid tag from https://github.com/josephspurrier/goversioninfo
19+
ARG GOVERSIONINFO_VERSION=v1.5.0
1720

1821
# GOTESTSUM_VERSION sets the version of gotestsum to install in the dev container.
1922
# It must be a valid tag in the https://github.com/gotestyourself/gotestsum repository.

dockerfiles/Dockerfile.dev

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
3535
GO111MODULE=on go install gotest.tools/gotestsum@${GOTESTSUM_VERSION}
3636

3737
FROM golang AS goversioninfo
38-
ARG GOVERSIONINFO_VERSION=v1.4.1
38+
# GOVERSIONINFO_VERSION is the version of GoVersionInfo to install.
39+
# It must be a valid tag from https://github.com/josephspurrier/goversioninfo
40+
ARG GOVERSIONINFO_VERSION=v1.5.0
3941
RUN --mount=type=cache,target=/root/.cache/go-build \
4042
--mount=type=cache,target=/go/pkg/mod \
4143
--mount=type=tmpfs,target=/go/src/ \

scripts/build/mkversioninfo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ VERSION_QUAD=$(printf "%s" "$VERSION" | sed -re 's/^([0-9.]*).*$/\1/' | sed -re
2020
# Generate versioninfo.json to be able to create a syso file which contains
2121
# Microsoft Windows Version Information and an icon using goversioninfo.
2222
# https://docs.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-block
23-
# https://github.com/josephspurrier/goversioninfo/blob/master/testdata/resource/versioninfo.json
23+
# https://github.com/josephspurrier/goversioninfo/blob/v1.5.0/testdata/resource/versioninfo.json
2424
cat > ./cmd/docker/winresources/versioninfo.json <<EOL
2525
{
2626
"FixedFileInfo":

0 commit comments

Comments
 (0)