From 763678f7cafb7561adeabadceaddf3e4b31a3387 Mon Sep 17 00:00:00 2001 From: danb Date: Thu, 31 Aug 2023 13:48:01 -0400 Subject: [PATCH] Added support for go 1.21.0 and set it to be default. (#167) * Added support for go 1.21.0 and set it to be default. * bumped minor versions * Update builder/go_versions.go Co-authored-by: Andrew Gouin * Update builder/go_versions.go Co-authored-by: Andrew Gouin --------- Co-authored-by: Andrew Gouin --- builder/go_versions.go | 11 +++++++---- builder/go_versions_test.go | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/builder/go_versions.go b/builder/go_versions.go index 106ce18..395ea6d 100644 --- a/builder/go_versions.go +++ b/builder/go_versions.go @@ -10,8 +10,9 @@ import ( const ( Go118Version = "1.18.10" - Go119Version = "1.19.6" - Go120Version = "1.20.1" + Go119Version = "1.19.12" + Go120Version = "1.20.7" + Go121Version = "1.21.0" // ADD NEW GO VERSION [1] - latest patch release for each major/minor // When updating alpine image, ensure all golang build image combinations below exist @@ -22,11 +23,12 @@ const ( Go118Image = Go118Version + "-alpine" + AlpineImageVersion Go119Image = Go119Version + "-alpine" + AlpineImageVersion Go120Image = Go120Version + "-alpine" + AlpineImageVersion + Go121Image = Go121Version + "-alpine" + AlpineImageVersion // ADD NEW GO VERSION [2] // ADD NEW GO VERSION [3] - update GoDefaultVersion and GoDefaultImage to latest - GoDefaultVersion = Go120Version - GoDefaultImage = Go120Image // default image for cosmos go builds if go.mod parse fails + GoDefaultVersion = Go121Version + GoDefaultImage = Go121Image // default image for cosmos go builds if go.mod parse fails ) type GoVersion struct { @@ -39,6 +41,7 @@ var GoImageForVersion = map[string]GoVersion{ "1.18": GoVersion{Version: Go118Version, Image: Go118Image}, "1.19": GoVersion{Version: Go119Version, Image: Go119Image}, "1.20": GoVersion{Version: Go120Version, Image: Go120Image}, + "1.21": GoVersion{Version: Go121Version, Image: Go121Image}, // ADD NEW GO VERSION [4] } diff --git a/builder/go_versions_test.go b/builder/go_versions_test.go index a3086ab..effd56c 100644 --- a/builder/go_versions_test.go +++ b/builder/go_versions_test.go @@ -20,6 +20,10 @@ func TestGoVersions(t *testing.T) { require.Equal(t, builder.Go120Image, goVer.Image) require.Equal(t, builder.Go120Version, goVer.Version) + goVer = builder.GetImageAndVersionForGoVersion("1.21") + require.Equal(t, builder.Go121Image, goVer.Image) + require.Equal(t, builder.Go121Version, goVer.Version) + goVer = builder.GetImageAndVersionForGoVersion("unknown") require.Equal(t, builder.GoDefaultImage, goVer.Image) require.Equal(t, builder.GoDefaultVersion, goVer.Version)