From bb70dca6b9465ebdbbb8682355bb22407b132f4f Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Wed, 10 Nov 2021 17:18:57 +0800 Subject: [PATCH] fix: install rocksdb in github actions (#10479) * fix: install rocksdb in github actions * install rocksdb 6.24.2 from source * go mod tidy * Run test-submodules on tm-db testing container rather than install rocksdb * cleanup Co-authored-by: Robert Zaremba --- .github/workflows/test.yml | 1 + db/go.mod | 4 ++-- db/go.sum | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 099817208..be70b6abb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,6 +48,7 @@ jobs: test-submodules: runs-on: ubuntu-latest + container: tendermintdev/docker-tm-db-testing steps: - uses: actions/checkout@v2 - uses: actions/setup-go@v2.1.4 diff --git a/db/go.mod b/db/go.mod index 0577e38ff..cb719e338 100644 --- a/db/go.mod +++ b/db/go.mod @@ -4,6 +4,7 @@ module github.com/cosmos/cosmos-sdk/db require ( github.com/dgraph-io/badger/v3 v3.2103.1 + github.com/dgraph-io/ristretto v0.1.0 github.com/google/btree v1.0.0 github.com/stretchr/testify v1.7.0 github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c @@ -13,7 +14,6 @@ require ( github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/dgraph-io/ristretto v0.1.0 // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect @@ -32,4 +32,4 @@ require ( // FIXME: gorocksdb bindings for OptimisticTransactionDB are not merged upstream, so we use a fork // See https://github.com/tecbot/gorocksdb/pull/216 -replace github.com/tecbot/gorocksdb => github.com/roysc/gorocksdb v1.1.0 +replace github.com/tecbot/gorocksdb => github.com/roysc/gorocksdb v1.1.1 diff --git a/db/go.sum b/db/go.sum index 2f70e9471..58f54d547 100644 --- a/db/go.sum +++ b/db/go.sum @@ -67,8 +67,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/roysc/gorocksdb v1.1.0 h1:+bPfxli0I3UhzJpghp/L8Y9oGR6SoDj4dFV5lPPHUvs= -github.com/roysc/gorocksdb v1.1.0/go.mod h1:b/U29r/CtguX3TF7mKG1Jjn4APDqh4wECshxXdiWHpA= +github.com/roysc/gorocksdb v1.1.1 h1:5qKNwi7V/AchRMjyVf5TMCcZP70ro+VyaRmQxzpRvd4= +github.com/roysc/gorocksdb v1.1.1/go.mod h1:b/U29r/CtguX3TF7mKG1Jjn4APDqh4wECshxXdiWHpA= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=