From d7469ce08b1580f62a253367a8c545324a692897 Mon Sep 17 00:00:00 2001
From: meiji163 <meiji163@github.com>
Date: Thu, 30 Apr 2026 15:27:00 -0700
Subject: [PATCH 1/2] upgrade to go1.25.9

---
 Dockerfile.packaging       | 2 +-
 Dockerfile.test            | 4 ++--
 go/logic/applier_test.go   | 3 +++
 go/logic/migrator_test.go  | 3 +++
 go/logic/streamer_test.go  | 3 +++
 script/ensure-go-installed | 8 ++++----
 script/test                | 6 +++---
 7 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Dockerfile.packaging b/Dockerfile.packaging
index 1f3812b85..0601ff215 100644
--- a/Dockerfile.packaging
+++ b/Dockerfile.packaging
@@ -1,4 +1,4 @@
-FROM golang:1.23-bullseye
+FROM golang:1.25.9
 
 RUN apt-get update
 RUN apt-get install -y ruby ruby-dev rubygems build-essential
diff --git a/Dockerfile.test b/Dockerfile.test
index b4e95d98b..c9479820a 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM golang:1.23-bullseye
+FROM golang:1.25.9
 LABEL maintainer="github@github.com"
 
 RUN apt-get update
@@ -8,4 +8,4 @@ RUN rm -rf /var/lib/apt/lists/*
 COPY . /go/src/github.com/github/gh-ost
 WORKDIR /go/src/github.com/github/gh-ost
 
-CMD ["script/test"]
+CMD ["script/test", "-short=1"]
diff --git a/go/logic/applier_test.go b/go/logic/applier_test.go
index fd055a9fc..ea8d5fb0a 100644
--- a/go/logic/applier_test.go
+++ b/go/logic/applier_test.go
@@ -1546,5 +1546,8 @@ func (suite *ApplierTestSuite) TestMultipleDMLEventsInBatch() {
 }
 
 func TestApplier(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping applier test suite in short mode")
+	}
 	suite.Run(t, new(ApplierTestSuite))
 }
diff --git a/go/logic/migrator_test.go b/go/logic/migrator_test.go
index df0d21733..e94710bb6 100644
--- a/go/logic/migrator_test.go
+++ b/go/logic/migrator_test.go
@@ -1099,6 +1099,9 @@ func (suite *MigratorTestSuite) TestRevert() {
 }
 
 func TestMigrator(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping migrator test suite in short mode")
+	}
 	suite.Run(t, new(MigratorTestSuite))
 }
 
diff --git a/go/logic/streamer_test.go b/go/logic/streamer_test.go
index 8e0b57f80..233f5b788 100644
--- a/go/logic/streamer_test.go
+++ b/go/logic/streamer_test.go
@@ -260,5 +260,8 @@ func (suite *EventsStreamerTestSuite) TestStreamEventsAutomaticallyReconnects()
 }
 
 func TestEventsStreamer(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping events streamer test suite in short mode")
+	}
 	suite.Run(t, new(EventsStreamerTestSuite))
 }
diff --git a/script/ensure-go-installed b/script/ensure-go-installed
index 3ed35c058..8f6f3d3c1 100755
--- a/script/ensure-go-installed
+++ b/script/ensure-go-installed
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-PREFERRED_GO_VERSION=go1.23.0
+PREFERRED_GO_VERSION=go1.25.9
 SUPPORTED_GO_VERSIONS='go1.2[012345]'
 
 GO_PKG_DARWIN=${PREFERRED_GO_VERSION}.darwin-amd64.pkg
-GO_PKG_DARWIN_SHA=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+GO_PKG_DARWIN_SHA=2254498b78a9bf81188e9daca5573df68ca04e5a67cbd508461b3f37506cef83
 
 GO_PKG_LINUX=${PREFERRED_GO_VERSION}.linux-amd64.tar.gz
-GO_PKG_LINUX_SHA=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+GO_PKG_LINUX_SHA=00859d7bd6defe8bf84d9db9e57b9a4467b2887c18cd93ae7460e713db774bc1
 
 export ROOTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 cd $ROOTDIR
@@ -35,7 +35,7 @@ if [ -z "$(which go)" ] || [ -z "$(go version | grep "$SUPPORTED_GO_VERSIONS")"
     curl -L -O https://dl.google.com/go/$GO_PKG_DARWIN
     shasum -a256 $GO_PKG_DARWIN | grep $GO_PKG_DARWIN_SHA
     xar -xf $GO_PKG_DARWIN
-    cpio -i <com.googlecode.go.pkg/Payload
+    cpio -i <Distribution 
   else
     curl -L -O https://dl.google.com/go/$GO_PKG_LINUX
     shasum -a256 $GO_PKG_LINUX | grep $GO_PKG_LINUX_SHA
diff --git a/script/test b/script/test
index 5c32b370c..7c58e6520 100755
--- a/script/test
+++ b/script/test
@@ -5,8 +5,8 @@ set -e
 . script/bootstrap
 
 echo "Verifying code is formatted via 'gofmt -s -w  go/'"
-gofmt -s -w  go/
-git diff --exit-code --quiet
+gofmt -s -w go/
+git diff --exit-code --quiet go/
 
 echo "Building"
 script/build
@@ -14,4 +14,4 @@ script/build
 cd .gopath/src/github.com/github/gh-ost
 
 echo "Running unit tests"
-go test -v -covermode=atomic ./go/...
+go test "$@" -v -covermode=atomic ./go/...

From c140678497817ea6071e2cf37768c5bc3fc3b72c Mon Sep 17 00:00:00 2001
From: meiji163 <meiji163@github.com>
Date: Thu, 30 Apr 2026 15:39:01 -0700
Subject: [PATCH 2/2] upgrade go.mod

---
 Dockerfile.packaging       | 2 +-
 Dockerfile.test            | 2 +-
 go.mod                     | 2 +-
 script/ensure-go-installed | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.packaging b/Dockerfile.packaging
index 0601ff215..41ac23eb5 100644
--- a/Dockerfile.packaging
+++ b/Dockerfile.packaging
@@ -1,4 +1,4 @@
-FROM golang:1.25.9
+FROM golang:1.25.9-bookworm
 
 RUN apt-get update
 RUN apt-get install -y ruby ruby-dev rubygems build-essential
diff --git a/Dockerfile.test b/Dockerfile.test
index c9479820a..562308d8e 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM golang:1.25.9
+FROM golang:1.25.9-bookworm
 LABEL maintainer="github@github.com"
 
 RUN apt-get update
diff --git a/go.mod b/go.mod
index 0cca873cf..ae6138d7a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/github/gh-ost
 
-go 1.23.0
+go 1.25.9
 
 require (
 	github.com/go-ini/ini v1.67.0
diff --git a/script/ensure-go-installed b/script/ensure-go-installed
index 8f6f3d3c1..917f7a433 100755
--- a/script/ensure-go-installed
+++ b/script/ensure-go-installed
@@ -35,7 +35,7 @@ if [ -z "$(which go)" ] || [ -z "$(go version | grep "$SUPPORTED_GO_VERSIONS")"
     curl -L -O https://dl.google.com/go/$GO_PKG_DARWIN
     shasum -a256 $GO_PKG_DARWIN | grep $GO_PKG_DARWIN_SHA
     xar -xf $GO_PKG_DARWIN
-    cpio -i <Distribution 
+    cpio -i <org.golang.go.pkg/Payload
   else
     curl -L -O https://dl.google.com/go/$GO_PKG_LINUX
     shasum -a256 $GO_PKG_LINUX | grep $GO_PKG_LINUX_SHA