[main] Upgrade the Golang version to go1.23.3 (vitessio#17199)

Signed-off-by: GitHub <[email protected]> Signed-off-by: Florent Poinsard <[email protected]> Co-authored-by: frouioui <[email protected]> Co-authored-by: Florent Poinsard <[email protected]> Signed-off-by: Renan Rangel <[email protected]>
rvrangel · Nov 21, 2024 · 74ed73c · 74ed73c
1 parent 8bdd1bd
commit 74ed73c
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/update_golang_version.yml b/.github/workflows/update_golang_version.yml
@@ -15,7 +15,7 @@ jobs:
       pull-requests: write
     strategy:
       matrix:
-        branch: [ main, release-21.0, release-20.0, release-19.0, release-18.0 ]
+        branch: [ main, release-21.0, release-20.0, release-19.0 ]
     name: Update Golang Version
     runs-on: ubuntu-latest
     steps:
@@ -39,8 +39,10 @@ jobs:
 
           if [ ${{ matrix.branch }} == "main" ]; then
             go run ./go/tools/go-upgrade/go-upgrade.go upgrade --main --allow-major-upgrade
-          else
+          else if [ ${{ matrix.branch }} == "release-21.0" ]; then
             go run ./go/tools/go-upgrade/go-upgrade.go upgrade
+          else
+            go run ./go/tools/go-upgrade/go-upgrade.go upgrade --workflow-update=false
           fi
 
           output=$(git status -s)

diff --git a/Makefile b/Makefile
@@ -286,7 +286,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
 # This rule builds the bootstrap images for all flavors.
 DOCKER_IMAGES_FOR_TEST = mysql80 percona80
 DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
-BOOTSTRAP_VERSION=37
+BOOTSTRAP_VERSION=38
 ensure_bootstrap_version:
 	find docker/ -type f -exec sed -i "s/^\(ARG bootstrap_version\)=.*/\1=${BOOTSTRAP_VERSION}/" {} \;
 	sed -i 's/\(^.*flag.String(\"bootstrap-version\",\) *\"[^\"]\+\"/\1 \"${BOOTSTRAP_VERSION}\"/' test.go

diff --git a/build.env b/build.env
@@ -17,7 +17,7 @@
 source ./tools/shell_functions.inc
 
 go version >/dev/null 2>&1 || fail "Go is not installed or is not in \$PATH. See https://vitess.io/contributing/build-from-source for install instructions."
-goversion_min 1.23.2 || echo "Go version reported: `go version`. Version 1.23.2+ recommended. See https://vitess.io/contributing/build-from-source for install instructions."
+goversion_min 1.23.3 || echo "Go version reported: `go version`. Version 1.23.3+ recommended. See https://vitess.io/contributing/build-from-source for install instructions."
 
 mkdir -p dist
 mkdir -p bin

diff --git a/docker/bootstrap/CHANGELOG.md b/docker/bootstrap/CHANGELOG.md
@@ -145,4 +145,8 @@ List of changes between bootstrap image versions.
 
 ## [37] - 2024-10-04
 ### Changes
-- Update build to golang 1.23.2
+- Update build to golang 1.23.2
+
+## [38] - 2024-11-10
+### Changes
+- Update build to golang 1.23.3
diff --git a/docker/bootstrap/Dockerfile.common b/docker/bootstrap/Dockerfile.common
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 golang:1.23.2-bullseye
+FROM --platform=linux/amd64 golang:1.23.3-bullseye
 
 # Install Vitess build dependencies
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

diff --git a/docker/lite/Dockerfile b/docker/lite/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=linux/amd64 golang:1.23.2-bullseye AS builder
+FROM --platform=linux/amd64 golang:1.23.3-bullseye AS builder
 
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER

diff --git a/docker/lite/Dockerfile.percona80 b/docker/lite/Dockerfile.percona80
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=linux/amd64 golang:1.23.2-bullseye AS builder
+FROM --platform=linux/amd64 golang:1.23.3-bullseye AS builder
 
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER

diff --git a/docker/vttestserver/Dockerfile.mysql80 b/docker/vttestserver/Dockerfile.mysql80
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=linux/amd64 golang:1.23.2-bullseye AS builder
+FROM --platform=linux/amd64 golang:1.23.3-bullseye AS builder
 
 # Allows docker builds to set the BUILD_NUMBER
 ARG BUILD_NUMBER

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module vitess.io/vitess
 
-go 1.23.2
+go 1.23.3
 
 require (
 	cloud.google.com/go/storage v1.43.0

diff --git a/test.go b/test.go
@@ -77,7 +77,7 @@ For example:
 // Flags
 var (
 	flavor           = flag.String("flavor", "mysql80", "comma-separated bootstrap flavor(s) to run against (when using Docker mode). Available flavors: all,"+flavors)
-	bootstrapVersion = flag.String("bootstrap-version", "37", "the version identifier to use for the docker images")
+	bootstrapVersion = flag.String("bootstrap-version", "38", "the version identifier to use for the docker images")
 	runCount         = flag.Int("runs", 1, "run each test this many times")
 	retryMax         = flag.Int("retry", 3, "max number of retries, to detect flaky tests")
 	logPass          = flag.Bool("log-pass", false, "log test output even if it passes")

diff --git a/test/templates/dockerfile.tpl b/test/templates/dockerfile.tpl
@@ -1,4 +1,4 @@
-ARG bootstrap_version=37
+ARG bootstrap_version=38
 ARG image="vitess/bootstrap:${bootstrap_version}-{{.Platform}}"
 
 FROM "${image}"