Skip to content

Commit 4d38923

Browse files
authored
Upgrade to go1.25.9 (#1668)
1 parent 4d37b8a commit 4d38923

8 files changed

Lines changed: 20 additions & 11 deletions

File tree

Dockerfile.packaging

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23-bullseye
1+
FROM golang:1.25.9-bookworm
22

33
RUN apt-get update
44
RUN apt-get install -y ruby ruby-dev rubygems build-essential

Dockerfile.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23-bullseye
1+
FROM golang:1.25.9-bookworm
22
LABEL maintainer="github@github.com"
33

44
RUN apt-get update
@@ -8,4 +8,4 @@ RUN rm -rf /var/lib/apt/lists/*
88
COPY . /go/src/github.com/github/gh-ost
99
WORKDIR /go/src/github.com/github/gh-ost
1010

11-
CMD ["script/test"]
11+
CMD ["script/test", "-short=1"]

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/github/gh-ost
22

3-
go 1.23.0
3+
go 1.25.9
44

55
require (
66
github.com/go-ini/ini v1.67.0

go/logic/applier_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1543,5 +1543,8 @@ func (suite *ApplierTestSuite) TestMultipleDMLEventsInBatch() {
15431543
}
15441544

15451545
func TestApplier(t *testing.T) {
1546+
if testing.Short() {
1547+
t.Skip("skipping applier test suite in short mode")
1548+
}
15461549
suite.Run(t, new(ApplierTestSuite))
15471550
}

go/logic/migrator_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,6 +1095,9 @@ func (suite *MigratorTestSuite) TestRevert() {
10951095
}
10961096

10971097
func TestMigrator(t *testing.T) {
1098+
if testing.Short() {
1099+
t.Skip("skipping migrator test suite in short mode")
1100+
}
10981101
suite.Run(t, new(MigratorTestSuite))
10991102
}
11001103

go/logic/streamer_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,5 +258,8 @@ func (suite *EventsStreamerTestSuite) TestStreamEventsAutomaticallyReconnects()
258258
}
259259

260260
func TestEventsStreamer(t *testing.T) {
261+
if testing.Short() {
262+
t.Skip("skipping events streamer test suite in short mode")
263+
}
261264
suite.Run(t, new(EventsStreamerTestSuite))
262265
}

script/ensure-go-installed

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/bash
22

3-
PREFERRED_GO_VERSION=go1.23.0
3+
PREFERRED_GO_VERSION=go1.25.9
44
SUPPORTED_GO_VERSIONS='go1.2[012345]'
55

66
GO_PKG_DARWIN=${PREFERRED_GO_VERSION}.darwin-amd64.pkg
7-
GO_PKG_DARWIN_SHA=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
7+
GO_PKG_DARWIN_SHA=2254498b78a9bf81188e9daca5573df68ca04e5a67cbd508461b3f37506cef83
88

99
GO_PKG_LINUX=${PREFERRED_GO_VERSION}.linux-amd64.tar.gz
10-
GO_PKG_LINUX_SHA=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
10+
GO_PKG_LINUX_SHA=00859d7bd6defe8bf84d9db9e57b9a4467b2887c18cd93ae7460e713db774bc1
1111

1212
export ROOTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
1313
cd $ROOTDIR
@@ -35,7 +35,7 @@ if [ -z "$(which go)" ] || [ -z "$(go version | grep "$SUPPORTED_GO_VERSIONS")"
3535
curl -L -O https://dl.google.com/go/$GO_PKG_DARWIN
3636
shasum -a256 $GO_PKG_DARWIN | grep $GO_PKG_DARWIN_SHA
3737
xar -xf $GO_PKG_DARWIN
38-
cpio -i <com.googlecode.go.pkg/Payload
38+
cpio -i <org.golang.go.pkg/Payload
3939
else
4040
curl -L -O https://dl.google.com/go/$GO_PKG_LINUX
4141
shasum -a256 $GO_PKG_LINUX | grep $GO_PKG_LINUX_SHA

script/test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ set -e
55
. script/bootstrap
66

77
echo "Verifying code is formatted via 'gofmt -s -w go/'"
8-
gofmt -s -w go/
9-
git diff --exit-code --quiet
8+
gofmt -s -w go/
9+
git diff --exit-code --quiet go/
1010

1111
echo "Building"
1212
script/build
1313

1414
cd .gopath/src/github.com/github/gh-ost
1515

1616
echo "Running unit tests"
17-
go test -v -covermode=atomic ./go/...
17+
go test "$@" -v -covermode=atomic ./go/...

0 commit comments

Comments
 (0)