Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump github.com/cockroachdb/cockroach-go/v2 from 2.3.5 to 2.3.6 #3305

Merged
merged 3 commits into from
Jan 21, 2024
Merged

Bump github.com/cockroachdb/cockroach-go/v2 from 2.3.5 to 2.3.6 #3305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7c51f3
Bump github.com/cockroachdb/cockroach-go/v2 from 2.3.5 to 2.3.6
dependabot[bot] Jan 20, 2024
ec6491f
Update crdb testserver version to latest format
roger2hk Jan 21, 2024
a93a374
Revert crdb testserver from 22.2.17 to 22.2.7
roger2hk Jan 21, 2024
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
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
cloud.google.com/go/spanner v1.55.0
contrib.go.opencensus.io/exporter/stackdriver v0.13.14
github.com/apache/beam/sdks/v2 v2.53.0
github.com/cockroachdb/cockroach-go/v2 v2.3.5
github.com/cockroachdb/cockroach-go/v2 v2.3.6
github.com/fullstorydev/grpcurl v1.8.9
github.com/go-redis/redis v6.15.9+incompatible
github.com/go-sql-driver/mysql v1.7.1
Expand Down Expand Up @@ -177,5 +177,6 @@ require (
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ github.com/cncf/xds/go v0.0.0-20231016030527-8bd2eac9fb4a h1:SZL0tarhuhoN0kvo5pf
github.com/cncf/xds/go v0.0.0-20231016030527-8bd2eac9fb4a/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
github.com/cockroachdb/cockroach-go/v2 v2.3.5 h1:Khtm8K6fTTz/ZCWPzU9Ne3aOW9VyAnj4qIPCJgKtwK0=
github.com/cockroachdb/cockroach-go/v2 v2.3.5/go.mod h1:1wNJ45eSXW9AnOc3skntW9ZUZz6gxrQK3cOj3rK+BC8=
github.com/cockroachdb/cockroach-go/v2 v2.3.6 h1:Wlv9TzkrG9V7i6u8dEtmXPrBzvfFp+CgJNs696rAajM=
github.com/cockroachdb/cockroach-go/v2 v2.3.6/go.mod h1:1wNJ45eSXW9AnOc3skntW9ZUZz6gxrQK3cOj3rK+BC8=
github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA=
github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
Expand Down
2 changes: 1 addition & 1 deletion integration/cloudbuild/testbase/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y \
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.1

# Install CockroachDB, see https://www.cockroachlabs.com/docs/v22.2/install-cockroachdb-linux
RUN curl https://binaries.cockroachdb.com/cockroach-v22.2.17.linux-amd64.tgz | tar -xz && cp -i cockroach-v22.2.17.linux-amd64/cockroach /usr/local/bin/
RUN curl https://binaries.cockroachdb.com/cockroach-v22.2.7.linux-amd64.tgz | tar -xz && cp -i cockroach-v22.2.7.linux-amd64/cockroach /usr/local/bin/

RUN mkdir protoc && \
(cd protoc && \
Expand Down
2 changes: 1 addition & 1 deletion quota/crdbqm/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
)

func TestMain(m *testing.M) {
ts, err := testserver.NewTestServer(testserver.CustomVersionOpt("22.2.17"), testserver.StoreOnDiskOpt())
ts, err := testserver.NewTestServer(testserver.CustomVersionOpt("v22.2.7"))
if err != nil {
klog.Errorf("Failed to start test server: %v", err)
os.Exit(1)
Expand Down
2 changes: 1 addition & 1 deletion storage/crdb/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (db *testDBHandle) GetDB() *sql.DB {
func TestMain(m *testing.M) {
flag.Parse()

ts, err := testserver.NewTestServer(testserver.CustomVersionOpt("22.2.17"), testserver.StoreOnDiskOpt())
ts, err := testserver.NewTestServer(testserver.CustomVersionOpt("v22.2.7"))
if err != nil {
klog.Exitf("Failed to start test server: %v", err)
}
Expand Down
Loading