From 91593cf91797ca0a98ffa31842107a9d916da37b Mon Sep 17 00:00:00 2001 From: Natalie Arellano Date: Thu, 15 Jun 2023 12:54:08 -0400 Subject: [PATCH] Bump go to 1.20 (#1130) Signed-off-by: Natalie Arellano --- Makefile | 2 +- acceptance/testdata/launcher/Dockerfile | 2 +- acceptance/testdata/launcher/Dockerfile.windows | 2 +- go.mod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index af8e4b737..75226123f 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ LDFLAGS+=-X 'github.com/buildpacks/lifecycle/cmd.Version=$(LIFECYCLE_VERSION)' GOBUILD:=go build $(GOFLAGS) -ldflags "$(LDFLAGS)" GOTEST=$(GOCMD) test $(GOFLAGS) BUILD_DIR?=$(PWD)$/out -WINDOWS_COMPILATION_IMAGE?=golang:1.19-windowsservercore-1809 +WINDOWS_COMPILATION_IMAGE?=golang:1.20-windowsservercore-1809 SOURCE_COMPILATION_IMAGE?=lifecycle-img BUILD_CTR?=lifecycle-ctr DOCKER_CMD?=make test diff --git a/acceptance/testdata/launcher/Dockerfile b/acceptance/testdata/launcher/Dockerfile index 91f017004..e5c506660 100644 --- a/acceptance/testdata/launcher/Dockerfile +++ b/acceptance/testdata/launcher/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19 as builder +FROM golang:1.20 as builder COPY exec.d/ /go/src/exec.d RUN GO111MODULE=off go build -o helper ./src/exec.d diff --git a/acceptance/testdata/launcher/Dockerfile.windows b/acceptance/testdata/launcher/Dockerfile.windows index cfd97c1b9..026bf2bd8 100644 --- a/acceptance/testdata/launcher/Dockerfile.windows +++ b/acceptance/testdata/launcher/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM golang:1.19-nanoserver-1809 +FROM golang:1.20-nanoserver-1809 COPY exec.d/ /go/src/exec.d WORKDIR /go/src diff --git a/go.mod b/go.mod index bd0a775b5..1901c5f1a 100644 --- a/go.mod +++ b/go.mod @@ -123,7 +123,7 @@ require ( google.golang.org/protobuf v1.30.0 // indirect ) -go 1.19 +go 1.20 // Ensure we only pull in the latest version of containerd replace github.com/containerd/containerd => github.com/containerd/containerd v1.7.1