From 1ac7a79ab96d5103584bdba41407a09c5caa66f9 Mon Sep 17 00:00:00 2001 From: Prajyot-Parab Date: Thu, 25 May 2023 22:50:08 +0530 Subject: [PATCH] Bump golang version (1.20.3 -> 1.20.4) Signed-off-by: Prajyot-Parab --- Makefile | 2 +- Tiltfile | 2 +- hack/ensure-go.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a0fe1022ec1f..2d00df3b9128 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ SHELL:=/usr/bin/env bash # # Go. # -GO_VERSION ?= 1.20.3 +GO_VERSION ?= 1.20.4 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION) # Use GOPROXY environment variable if set diff --git a/Tiltfile b/Tiltfile index 8ba12577028e..2874781e325a 100644 --- a/Tiltfile +++ b/Tiltfile @@ -165,7 +165,7 @@ def load_provider_tiltfiles(): tilt_helper_dockerfile_header = """ # Tilt image -FROM golang:1.20.3 as tilt-helper +FROM golang:1.20.4 as tilt-helper # Install delve. Note this should be kept in step with the Go release minor version. RUN go install github.com/go-delve/delve/cmd/dlv@v1.20 # Support live reloading with Tilt diff --git a/hack/ensure-go.sh b/hack/ensure-go.sh index 06a450c244ff..17d125b72e24 100755 --- a/hack/ensure-go.sh +++ b/hack/ensure-go.sh @@ -38,7 +38,7 @@ EOF local go_version IFS=" " read -ra go_version <<< "$(go version)" local minimum_go_version - minimum_go_version=go1.20.3 + minimum_go_version=go1.20.4 if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then cat <