From f68d8f1f24ad860fd4d5bf704d1d28170fcb347c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 11 Oct 2025 00:03:50 +0200 Subject: [PATCH 1/2] scripts/build/mkversioninfo: use permalink in comment Signed-off-by: Sebastiaan van Stijn --- scripts/build/mkversioninfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/mkversioninfo b/scripts/build/mkversioninfo index b349e9226..1cbc6dcc5 100755 --- a/scripts/build/mkversioninfo +++ b/scripts/build/mkversioninfo @@ -20,7 +20,7 @@ VERSION_QUAD=$(printf "%s" "$VERSION" | sed -re 's/^([0-9.]*).*$/\1/' | sed -re # Generate versioninfo.json to be able to create a syso file which contains # Microsoft Windows Version Information and an icon using goversioninfo. # https://docs.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-block -# https://github.com/josephspurrier/goversioninfo/blob/master/testdata/resource/versioninfo.json +# https://github.com/josephspurrier/goversioninfo/blob/v1.5.0/testdata/resource/versioninfo.json cat > ./cmd/docker/winresources/versioninfo.json < Date: Sat, 11 Oct 2025 00:09:26 +0200 Subject: [PATCH 2/2] Dockerfile: bump github.com/josephspurrier/goversioninfo to v1.5.0 - Upgrade to Go 1.18 minimum version and remove ioutil references - Move from Travis to GitHub Actions for CI - Support multiple icons - Add options to parse version string full diff: https://github.com/josephspurrier/goversioninfo/compare/v1.4.1...v1.5.0 Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 5 ++++- dockerfiles/Dockerfile.dev | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f85b97233..bc83cc537 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,10 @@ ARG GO_VERSION=1.24.8 # XX_VERSION specifies the version of the xx utility to use. # It must be a valid tag in the docker.io/tonistiigi/xx image repository. ARG XX_VERSION=1.7.0 -ARG GOVERSIONINFO_VERSION=v1.4.1 + +# GOVERSIONINFO_VERSION is the version of GoVersionInfo to install. +# It must be a valid tag from https://github.com/josephspurrier/goversioninfo +ARG GOVERSIONINFO_VERSION=v1.5.0 # GOTESTSUM_VERSION sets the version of gotestsum to install in the dev container. # It must be a valid tag in the https://github.com/gotestyourself/gotestsum repository. diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 063a2c036..3f3138a07 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -35,7 +35,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ GO111MODULE=on go install gotest.tools/gotestsum@${GOTESTSUM_VERSION} FROM golang AS goversioninfo -ARG GOVERSIONINFO_VERSION=v1.4.1 +# GOVERSIONINFO_VERSION is the version of GoVersionInfo to install. +# It must be a valid tag from https://github.com/josephspurrier/goversioninfo +ARG GOVERSIONINFO_VERSION=v1.5.0 RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ --mount=type=tmpfs,target=/go/src/ \