Merge pull request #1935 from samir900/main

Upgrade Golang version to v1.20
vmware-tanzu · Oct 18, 2023 · e0a409a · e0a409a
2 parents eb5ac8a + cd158f4
commit e0a409a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/sonobuoy
 
-go 1.19
+go 1.20
 
 require (
 	github.com/briandowns/spinner v1.19.0

diff --git a/scripts/build_funcs.sh b/scripts/build_funcs.sh
@@ -28,7 +28,7 @@ IMAGE_BRANCH=$(git rev-parse --abbrev-ref HEAD | sed 's/\///g')
 GIT_REF_LONG=$(git rev-parse --verify HEAD)
 
 BUILDMNT=/go/src/$GOTARGET
-BUILD_IMAGE=golang:1.19
+BUILD_IMAGE=golang:1.20
 AMD_IMAGE=gcr.io/distroless/static:nonroot
 ARM_IMAGE=gcr.io/distroless/static:nonroot-arm64
 PPC64LE_IMAGE=gcr.io/distroless/static:nonroot-ppc64le

diff --git a/test/integration/testImage/Dockerfile b/test/integration/testImage/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.19 AS base
+FROM golang:1.20 AS base
 WORKDIR /src
 
 # Handle the go modules first to take advantage of Docker cache.

diff --git a/test/integration/testImage/src/go.mod b/test/integration/testImage/src/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/sonobuoy/test/integration/testImage/src
 
-go 1.19
+go 1.20
 
 require (
 	github.com/pkg/errors v0.8.1