From f08898c2c3d7f7688820d1f4c283a7553a858697 Mon Sep 17 00:00:00 2001 From: Milos Gajdos Date: Fri, 1 Dec 2023 08:33:35 +0000 Subject: [PATCH 1/3] update: bump Go version It'd appear 1.20.10 is triggering some scanner alerts. Though these are not critical, it costs us very little effort to bump the runtime one minor version higher. Signed-off-by: Milos Gajdos --- Dockerfile | 2 +- dockerfiles/docs.Dockerfile | 2 +- dockerfiles/git.Dockerfile | 2 +- dockerfiles/lint.Dockerfile | 2 +- dockerfiles/vendor.Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 77f441c22..74acd966d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20.10 +ARG GO_VERSION=1.20.11 ARG ALPINE_VERSION=3.18 ARG XX_VERSION=1.2.1 diff --git a/dockerfiles/docs.Dockerfile b/dockerfiles/docs.Dockerfile index 84306d3a2..b86d21e04 100644 --- a/dockerfiles/docs.Dockerfile +++ b/dockerfiles/docs.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20.10 +ARG GO_VERSION=1.20.11 ARG ALPINE_VERSION=3.18 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base diff --git a/dockerfiles/git.Dockerfile b/dockerfiles/git.Dockerfile index 698ad10ee..2fa86dd97 100644 --- a/dockerfiles/git.Dockerfile +++ b/dockerfiles/git.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20.10 +ARG GO_VERSION=1.20.11 ARG ALPINE_VERSION=3.18 FROM alpine:${ALPINE_VERSION} AS base diff --git a/dockerfiles/lint.Dockerfile b/dockerfiles/lint.Dockerfile index 27ef51e8d..5e6bf24a3 100644 --- a/dockerfiles/lint.Dockerfile +++ b/dockerfiles/lint.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20.10 +ARG GO_VERSION=1.20.11 ARG ALPINE_VERSION=3.18 ARG GOLANGCI_LINT_VERSION=v1.55.2 ARG BUILDTAGS="include_gcs" diff --git a/dockerfiles/vendor.Dockerfile b/dockerfiles/vendor.Dockerfile index c5bdde947..f235147d0 100644 --- a/dockerfiles/vendor.Dockerfile +++ b/dockerfiles/vendor.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20.10 +ARG GO_VERSION=1.20.11 ARG ALPINE_VERSION=3.18 ARG MODOUTDATED_VERSION=v0.8.0 From 2cf416400eaee0a57f5aefb9fc0d453f3d5f6663 Mon Sep 17 00:00:00 2001 From: Milos Gajdos Date: Fri, 1 Dec 2023 08:58:46 +0000 Subject: [PATCH 2/3] update: missed the CI workflow Signed-off-by: Milos Gajdos --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3437271e9..111d22e04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: fail-fast: false matrix: go: - - 1.20.10 + - 1.20.11 - 1.21.3 target: - test-coverage From f3ba0acd24049b1d2fe995a73563228afd554888 Mon Sep 17 00:00:00 2001 From: Milos Gajdos Date: Wed, 6 Dec 2023 10:32:40 +0000 Subject: [PATCH 3/3] update: bump Go runtime to 1.21.5 and the rest to latest 1.20 Signed-off-by: Milos Gajdos --- .github/workflows/build.yml | 4 ++-- Dockerfile | 2 +- dockerfiles/docs.Dockerfile | 2 +- dockerfiles/git.Dockerfile | 2 +- dockerfiles/lint.Dockerfile | 2 +- dockerfiles/vendor.Dockerfile | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 111d22e04..2e4dc65f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,8 +27,8 @@ jobs: fail-fast: false matrix: go: - - 1.20.11 - - 1.21.3 + - 1.20.12 + - 1.21.5 target: - test-coverage - test-cloud-storage diff --git a/Dockerfile b/Dockerfile index 74acd966d..05ccb16e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20.11 +ARG GO_VERSION=1.21.5 ARG ALPINE_VERSION=3.18 ARG XX_VERSION=1.2.1 diff --git a/dockerfiles/docs.Dockerfile b/dockerfiles/docs.Dockerfile index b86d21e04..f54afdc7f 100644 --- a/dockerfiles/docs.Dockerfile +++ b/dockerfiles/docs.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20.11 +ARG GO_VERSION=1.21.5 ARG ALPINE_VERSION=3.18 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base diff --git a/dockerfiles/git.Dockerfile b/dockerfiles/git.Dockerfile index 2fa86dd97..499c02a5b 100644 --- a/dockerfiles/git.Dockerfile +++ b/dockerfiles/git.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20.11 +ARG GO_VERSION=1.20.12 ARG ALPINE_VERSION=3.18 FROM alpine:${ALPINE_VERSION} AS base diff --git a/dockerfiles/lint.Dockerfile b/dockerfiles/lint.Dockerfile index 5e6bf24a3..d4629a3df 100644 --- a/dockerfiles/lint.Dockerfile +++ b/dockerfiles/lint.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20.11 +ARG GO_VERSION=1.20.12 ARG ALPINE_VERSION=3.18 ARG GOLANGCI_LINT_VERSION=v1.55.2 ARG BUILDTAGS="include_gcs" diff --git a/dockerfiles/vendor.Dockerfile b/dockerfiles/vendor.Dockerfile index f235147d0..c325839a9 100644 --- a/dockerfiles/vendor.Dockerfile +++ b/dockerfiles/vendor.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20.11 +ARG GO_VERSION=1.20.12 ARG ALPINE_VERSION=3.18 ARG MODOUTDATED_VERSION=v0.8.0