Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.packaging
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23-bullseye
FROM golang:1.25.9
Comment thread
meiji163 marked this conversation as resolved.
Outdated

RUN apt-get update
RUN apt-get install -y ruby ruby-dev rubygems build-essential
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23-bullseye
FROM golang:1.25.9
Comment thread
meiji163 marked this conversation as resolved.
Outdated
LABEL maintainer="github@github.com"

RUN apt-get update
Expand All @@ -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"]
3 changes: 3 additions & 0 deletions go/logic/applier_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
3 changes: 3 additions & 0 deletions go/logic/migrator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

Expand Down
3 changes: 3 additions & 0 deletions go/logic/streamer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
8 changes: 4 additions & 4 deletions script/ensure-go-installed
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/bash

PREFERRED_GO_VERSION=go1.23.0
PREFERRED_GO_VERSION=go1.25.9
SUPPORTED_GO_VERSIONS='go1.2[012345]'
Comment thread
meiji163 marked this conversation as resolved.

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
Expand Down Expand Up @@ -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
Comment thread
meiji163 marked this conversation as resolved.
Outdated
else
curl -L -O https://dl.google.com/go/$GO_PKG_LINUX
shasum -a256 $GO_PKG_LINUX | grep $GO_PKG_LINUX_SHA
Expand Down
6 changes: 3 additions & 3 deletions script/test
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ set -e
. script/bootstrap

echo "Verifying code is formatted via 'gofmt -s -w go/'"
Comment thread
meiji163 marked this conversation as resolved.
gofmt -s -w go/
git diff --exit-code --quiet
gofmt -s -w go/
git diff --exit-code --quiet go/

echo "Building"
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/...
Loading