Skip to content

Commit 50c9d2c

Browse files
authored
bump go version to go1.23.5
Signed-off-by: GitHub <noreply@github.com>
1 parent dda98cd commit 50c9d2c

File tree

9 files changed

+13
-9
lines changed

9 files changed

+13
-9
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
286286
# This rule builds the bootstrap images for all flavors.
287287
DOCKER_IMAGES_FOR_TEST = mysql80 percona80
288288
DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
289-
BOOTSTRAP_VERSION=37.1
289+
BOOTSTRAP_VERSION=37.2
290290
ensure_bootstrap_version:
291291
find docker/ -type f -exec sed -i "s/^\(ARG bootstrap_version\)=.*/\1=${BOOTSTRAP_VERSION}/" {} \;
292292
sed -i 's/\(^.*flag.String(\"bootstrap-version\",\) *\"[^\"]\+\"/\1 \"${BOOTSTRAP_VERSION}\"/' test.go

build.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
source ./tools/shell_functions.inc
1818

1919
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."
20-
goversion_min 1.23.4 || echo "Go version reported: `go version`. Version 1.23.4+ recommended. See https://vitess.io/contributing/build-from-source for install instructions."
20+
goversion_min 1.23.5 || echo "Go version reported: `go version`. Version 1.23.5+ recommended. See https://vitess.io/contributing/build-from-source for install instructions."
2121

2222
mkdir -p dist
2323
mkdir -p bin

docker/bootstrap/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,8 @@ List of changes between bootstrap image versions.
153153

154154
## [37.1] - 2024-12-04
155155
### Changes
156-
- Update build to golang 1.23.4
156+
- Update build to golang 1.23.4
157+
158+
## [37.2] - 2025-01-17
159+
### Changes
160+
- Update build to golang 1.23.5

docker/bootstrap/Dockerfile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=linux/amd64 golang:1.23.4-bullseye
1+
FROM --platform=linux/amd64 golang:1.23.5-bullseye
22

33
# Install Vitess build dependencies
44
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

docker/lite/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=linux/amd64 golang:1.23.4-bullseye AS builder
15+
FROM --platform=linux/amd64 golang:1.23.5-bullseye AS builder
1616

1717
# Allows docker builds to set the BUILD_NUMBER
1818
ARG BUILD_NUMBER

docker/lite/Dockerfile.percona80

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=linux/amd64 golang:1.23.4-bullseye AS builder
15+
FROM --platform=linux/amd64 golang:1.23.5-bullseye AS builder
1616

1717
# Allows docker builds to set the BUILD_NUMBER
1818
ARG BUILD_NUMBER

docker/vttestserver/Dockerfile.mysql80

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=linux/amd64 golang:1.23.4-bullseye AS builder
15+
FROM --platform=linux/amd64 golang:1.23.5-bullseye AS builder
1616

1717
# Allows docker builds to set the BUILD_NUMBER
1818
ARG BUILD_NUMBER

test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ For example:
7777
// Flags
7878
var (
7979
flavor = flag.String("flavor", "mysql80", "comma-separated bootstrap flavor(s) to run against (when using Docker mode). Available flavors: all,"+flavors)
80-
bootstrapVersion = flag.String("bootstrap-version", "37.1", "the version identifier to use for the docker images")
80+
bootstrapVersion = flag.String("bootstrap-version", "37.2", "the version identifier to use for the docker images")
8181
runCount = flag.Int("runs", 1, "run each test this many times")
8282
retryMax = flag.Int("retry", 3, "max number of retries, to detect flaky tests")
8383
logPass = flag.Bool("log-pass", false, "log test output even if it passes")

test/templates/dockerfile.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG bootstrap_version=37.1
1+
ARG bootstrap_version=37.2
22
ARG image="vitess/bootstrap:${bootstrap_version}-{{.Platform}}"
33

44
FROM "${image}"

0 commit comments

Comments
 (0)