From 25f80118253b64aa0c7c1ed8787f5551dc44999a Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Wed, 28 Feb 2024 13:18:42 +0100 Subject: [PATCH] pin to go 1.21 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- .github/workflows/codeql.yml | 2 +- Dockerfile | 2 +- hack/dockerfiles/docs.Dockerfile | 2 +- hack/dockerfiles/generated-files.Dockerfile | 2 +- hack/dockerfiles/lint.Dockerfile | 2 +- hack/dockerfiles/vendor.Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ace7116d7ad..d3454f4ba82c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ env: TEST_CACHE_SCOPE: "test" TESTFLAGS: "-v --parallel=6 --timeout=30m" GOTESTSUM_FORMAT: "standard-verbose" - GO_VERSION: "1.21.6" + GO_VERSION: "1.21" GOTESTSUM_VERSION: "v1.9.0" # same as one in Dockerfile jobs: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 8f64690f145c..dc87b5a3755a 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,7 +13,7 @@ permissions: security-events: write env: - GO_VERSION: 1.21.6 + GO_VERSION: "1.21" jobs: codeql: diff --git a/Dockerfile b/Dockerfile index d5727aeaf6ce..a2a7e8690949 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.21.6 +ARG GO_VERSION=1.21 ARG XX_VERSION=1.4.0 ARG DOCKER_VERSION=25.0.2 diff --git a/hack/dockerfiles/docs.Dockerfile b/hack/dockerfiles/docs.Dockerfile index 533e58c30881..cfa93ce6d6cc 100644 --- a/hack/dockerfiles/docs.Dockerfile +++ b/hack/dockerfiles/docs.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.21.6 +ARG GO_VERSION=1.21 ARG FORMATS=md,yaml FROM golang:${GO_VERSION}-alpine AS docsgen diff --git a/hack/dockerfiles/generated-files.Dockerfile b/hack/dockerfiles/generated-files.Dockerfile index e202ea646768..87cce356bc63 100644 --- a/hack/dockerfiles/generated-files.Dockerfile +++ b/hack/dockerfiles/generated-files.Dockerfile @@ -5,7 +5,7 @@ # Copyright The Buildx Authors. # Licensed under the Apache License, Version 2.0 -ARG GO_VERSION="1.21.6" +ARG GO_VERSION="1.21" ARG PROTOC_VERSION="3.11.4" # protoc is dynamically linked to glibc so can't use alpine base diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile index c5a3ca909f82..ae5d4389b6fc 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.21.6 +ARG GO_VERSION=1.21 ARG XX_VERSION=1.3.0 ARG GOLANGCI_LINT_VERSION=1.54.2 diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile index 8c2f46efb99d..f7b84490dc8e 100644 --- a/hack/dockerfiles/vendor.Dockerfile +++ b/hack/dockerfiles/vendor.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.21.6 +ARG GO_VERSION=1.21 ARG MODOUTDATED_VERSION=v0.8.0 FROM golang:${GO_VERSION}-alpine AS base