From 3e247a1aef602f639fa2cdfe23e3eb639d28d134 Mon Sep 17 00:00:00 2001 From: Xavier Coulon Date: Fri, 30 Jan 2026 11:54:31 +0100 Subject: [PATCH] govulncheck: use golang:1.24 as a base image all active repositories have migrated to Go 1.24 also, local build is now called `govulncheckx` to distinguish from the official `govulncheck` Signed-off-by: Xavier Coulon --- govulncheck-action/Containerfile | 2 +- govulncheck-action/makefile | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/govulncheck-action/Containerfile b/govulncheck-action/Containerfile index 871c394..981afa2 100644 --- a/govulncheck-action/Containerfile +++ b/govulncheck-action/Containerfile @@ -12,7 +12,7 @@ ENV GOTOOLCHAIN=auto RUN echo "Building govulncheckx binary for $GOOS/$GOARCH" RUN GOOS=$GOOS GOARCH=$GOARCH go build -v -o govulncheckx main.go -FROM golang:1.23.0 +FROM golang:1.24.0 # using a fresh golang image without the `WORKDIR` from the builder stage # see https://docs.github.com/en/actions/reference/workflows-and-actions/dockerfile-support#workdir # using golang 1.23.0 since most of our projects are still using it (and toolchain will not downgrade the version of go) diff --git a/govulncheck-action/makefile b/govulncheck-action/makefile index 7c52e68..bc9c2c6 100644 --- a/govulncheck-action/makefile +++ b/govulncheck-action/makefile @@ -53,21 +53,13 @@ install-golangci-lint: # Installing # -------------------------------------- -GIT_COMMIT_ID_SHORT := $(shell git rev-parse --short HEAD) -ifneq ($(shell git status --porcelain --untracked-files=no),) - GIT_COMMIT_ID_SHORT := $(GIT_COMMIT_ID_SHORT)-dirty -endif - -BUILD_TIME = `date -u '+%Y-%m-%dT%H:%M:%SZ'` - - .PHONY: build ## build the binary and copy into ./bin build: @go build \ - -o bin/govulncheck main.go + -o bin/govulncheckx main.go .PHONY: install ## build the binary and copy into $(GOPATH)/bin install: build - @mv bin/govulncheck ${GOPATH}/bin/govulncheck + @mv bin/govulncheckx ${GOPATH}/bin/govulncheckx