From 159f725eac6acb35afb2c94b2034aed65e3a4bc2 Mon Sep 17 00:00:00 2001 From: "Eduardo J. Ortega U" <5791035+ejortegau@users.noreply.github.com> Date: Wed, 17 Jan 2024 17:36:37 +0100 Subject: [PATCH 1/4] Set bootstrap version to 14.12 with go 1.20.13 Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f75e3a0721c..df0de02e77b 100644 --- a/Makefile +++ b/Makefile @@ -243,7 +243,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto # This rule builds the bootstrap images for all flavors. DOCKER_IMAGES_FOR_TEST = mariadb mariadb103 mysql57 mysql80 percona57 percona80 DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST) -BOOTSTRAP_VERSION=10.2 +BOOTSTRAP_VERSION=14.12 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 From 9976f0cc5938c0f4ff92462095d1b3b03e45e923 Mon Sep 17 00:00:00 2001 From: "Eduardo J. Ortega U" <5791035+ejortegau@users.noreply.github.com> Date: Wed, 17 Jan 2024 18:19:07 +0100 Subject: [PATCH 2/4] Print go version before building Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com> --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index df0de02e77b..5a5da8c0de7 100644 --- a/Makefile +++ b/Makefile @@ -52,6 +52,7 @@ export CGO_CFLAGS := -O1 build-dyn: ifndef NOBANNER echo $$(date): Building source tree + go version endif bash ./build.env CGO_ENABLED=0 go install -trimpath $(EXTRA_BUILD_FLAGS) $(VT_GO_PARALLEL) -ldflags "$(shell tools/build_version_flags.sh)" ./go/... @@ -60,6 +61,7 @@ endif build: ifndef NOBANNER echo $$(date): Building source tree + go version endif bash ./build.env # build all the binaries by default with CGO disabled. @@ -71,6 +73,7 @@ endif cross-build: ifndef NOBANNER echo $$(date): Building source tree + go version endif bash ./build.env # In order to cross-compile, go install requires GOBIN to be unset @@ -85,6 +88,7 @@ endif debug: ifndef NOBANNER echo $$(date): Building source tree + go version endif bash ./build.env go install -trimpath $(EXTRA_BUILD_FLAGS) $(VT_GO_PARALLEL) -ldflags "$(shell tools/build_version_flags.sh)" -gcflags -'N -l' ./go/... From 606108f65b277a9b9603e736cb915acf6f5d4e3a Mon Sep 17 00:00:00 2001 From: "Eduardo J. Ortega U" <5791035+ejortegau@users.noreply.github.com> Date: Thu, 18 Jan 2024 09:38:11 +0100 Subject: [PATCH 3/4] Set default bootstrap version in test.go to 14.12 Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com> --- test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.go b/test.go index aabe8fab363..cf2235ea11c 100755 --- a/test.go +++ b/test.go @@ -76,7 +76,7 @@ For example: // Flags var ( flavor = flag.String("flavor", "mysql57", "comma-separated bootstrap flavor(s) to run against (when using Docker mode). Available flavors: all,"+flavors) - bootstrapVersion = flag.String("bootstrap-version", "10.2", "the version identifier to use for the docker images") + bootstrapVersion = flag.String("bootstrap-version", "14.12", "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") From ce8e394a12cd851470203c76f17e6af980a3a90f Mon Sep 17 00:00:00 2001 From: "Eduardo J. Ortega U" <5791035+ejortegau@users.noreply.github.com> Date: Thu, 18 Jan 2024 09:48:40 +0100 Subject: [PATCH 4/4] Set Go version for static code checks Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com> --- .github/workflows/static_checks_etc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static_checks_etc.yml b/.github/workflows/static_checks_etc.yml index 2e7e6f585db..e93787e58a0 100644 --- a/.github/workflows/static_checks_etc.yml +++ b/.github/workflows/static_checks_etc.yml @@ -93,7 +93,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && (steps.changes.outputs.go_files == 'true' || steps.changes.outputs.parser_changes == 'true' || steps.changes.outputs.proto_changes == 'true') uses: actions/setup-go@v3 with: - go-version: 1.18.7 + go-version: 1.20.13 - name: Get dependencies if: steps.skip-workflow.outputs.skip-workflow == 'false'