From 861dee577c044bdf791b4e76bc97c6ada235dbfe Mon Sep 17 00:00:00 2001 From: frouioui <35779988+frouioui@users.noreply.github.com> Date: Tue, 27 Jan 2026 00:40:38 +0000 Subject: [PATCH] bump go version to go1.24.12 Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Signed-off-by: Matt Lord --- Makefile | 2 +- build.env | 2 +- docker/bootstrap/CHANGELOG.md | 6 +++++- docker/bootstrap/Dockerfile.common | 2 +- docker/lite/Dockerfile | 2 +- docker/lite/Dockerfile.mysql84 | 2 +- docker/lite/Dockerfile.percona80 | 2 +- docker/vttestserver/Dockerfile.mysql80 | 2 +- docker/vttestserver/Dockerfile.mysql84 | 2 +- go.mod | 2 +- test.go | 2 +- test/templates/dockerfile.tpl | 2 +- 12 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 1ddba949b1e..9e2e697a9e2 100644 --- 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 mysql84 percona80 DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST) -BOOTSTRAP_VERSION=43.5 +BOOTSTRAP_VERSION=43.6 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 index 140c27f5cb9..6ae62334ef0 100755 --- 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.24.10 || echo "Go version reported: `go version`. Version 1.24.10+ recommended. See https://vitess.io/contributing/build-from-source for install instructions." +goversion_min 1.24.12 || echo "Go version reported: `go version`. Version 1.24.12+ 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 index 2275c4a5163..04630166b29 100644 --- a/docker/bootstrap/CHANGELOG.md +++ b/docker/bootstrap/CHANGELOG.md @@ -194,4 +194,8 @@ List of changes between bootstrap image versions. ## [43.5] - 2025-11-12 ### Changes -- Update build to golang 1.24.10 \ No newline at end of file +- Update build to golang 1.24.10 + +## [43.6] - 2026-01-27 +### Changes +- Update build to golang 1.24.12 \ No newline at end of file diff --git a/docker/bootstrap/Dockerfile.common b/docker/bootstrap/Dockerfile.common index 53f86503f2f..9117c401407 100644 --- a/docker/bootstrap/Dockerfile.common +++ b/docker/bootstrap/Dockerfile.common @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 golang:1.24.10-bookworm@sha256:6d78b05df97ae4d12e887f2f2ba6bd0d1b9d644bcf63604fbb4c43cf6839ed9c +FROM --platform=linux/amd64 golang:1.24.12-bookworm@sha256:8972893fa12177951b8bd4118470f338eaecea133c323be84066cd64f844fc03 # 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 index 7bc43d42776..a23413c473d 100644 --- 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.24.10-bookworm@sha256:6d78b05df97ae4d12e887f2f2ba6bd0d1b9d644bcf63604fbb4c43cf6839ed9c AS builder +FROM --platform=linux/amd64 golang:1.24.12-bookworm@sha256:8972893fa12177951b8bd4118470f338eaecea133c323be84066cd64f844fc03 AS builder # Allows docker builds to set the BUILD_NUMBER ARG BUILD_NUMBER diff --git a/docker/lite/Dockerfile.mysql84 b/docker/lite/Dockerfile.mysql84 index 52d61fd65b3..a2d0b08ac18 100644 --- a/docker/lite/Dockerfile.mysql84 +++ b/docker/lite/Dockerfile.mysql84 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=linux/amd64 golang:1.24.10-bookworm@sha256:6d78b05df97ae4d12e887f2f2ba6bd0d1b9d644bcf63604fbb4c43cf6839ed9c AS builder +FROM --platform=linux/amd64 golang:1.24.12-bookworm@sha256:8972893fa12177951b8bd4118470f338eaecea133c323be84066cd64f844fc03 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 index 41b3d9b2c2a..b4ed5bb0098 100644 --- 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.24.10-bookworm@sha256:6d78b05df97ae4d12e887f2f2ba6bd0d1b9d644bcf63604fbb4c43cf6839ed9c AS builder +FROM --platform=linux/amd64 golang:1.24.12-bookworm@sha256:8972893fa12177951b8bd4118470f338eaecea133c323be84066cd64f844fc03 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 index c7711b5a645..5b4dfac9cff 100644 --- 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.24.10-bookworm@sha256:6d78b05df97ae4d12e887f2f2ba6bd0d1b9d644bcf63604fbb4c43cf6839ed9c AS builder +FROM --platform=linux/amd64 golang:1.24.12-bookworm@sha256:8972893fa12177951b8bd4118470f338eaecea133c323be84066cd64f844fc03 AS builder # Allows docker builds to set the BUILD_NUMBER ARG BUILD_NUMBER diff --git a/docker/vttestserver/Dockerfile.mysql84 b/docker/vttestserver/Dockerfile.mysql84 index fe4d50b5283..ac727de46cb 100644 --- a/docker/vttestserver/Dockerfile.mysql84 +++ b/docker/vttestserver/Dockerfile.mysql84 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=linux/amd64 golang:1.24.10-bookworm@sha256:6d78b05df97ae4d12e887f2f2ba6bd0d1b9d644bcf63604fbb4c43cf6839ed9c AS builder +FROM --platform=linux/amd64 golang:1.24.12-bookworm@sha256:8972893fa12177951b8bd4118470f338eaecea133c323be84066cd64f844fc03 AS builder # Allows docker builds to set the BUILD_NUMBER ARG BUILD_NUMBER diff --git a/go.mod b/go.mod index cc354afe8f4..45a0cb1b0d6 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module vitess.io/vitess -go 1.24.10 +go 1.24.12 require ( cloud.google.com/go/storage v1.51.0 diff --git a/test.go b/test.go index a61861890ae..c1a235d9d33 100755 --- 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", "43.5", "the version identifier to use for the docker images") + bootstrapVersion = flag.String("bootstrap-version", "43.6", "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 index 3f0afe39e1b..53174e391ea 100644 --- a/test/templates/dockerfile.tpl +++ b/test/templates/dockerfile.tpl @@ -1,4 +1,4 @@ -ARG bootstrap_version=43.5 +ARG bootstrap_version=43.6 ARG image="vitess/bootstrap:${bootstrap_version}-{{.Platform}}" FROM "${image}"