Skip to content

Commit 0c2ff19

Browse files
ed255p4u
authored andcommitted
Update badger/v2 dependency
Update github.com/dgraph-io/badger/v2 to v2.2007.3 which fixes the protobuf namespace conflict. Remove the protobuf build flag introduced in 0a98f04
1 parent 0a98f04 commit 0c2ff19

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

Diff for: Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ WORKDIR /src
1010
COPY . .
1111
RUN --mount=type=cache,sharing=locked,id=gomod,target=/go/pkg/mod/cache \
1212
--mount=type=cache,sharing=locked,id=goroot,target=/root/.cache/go-build \
13-
go build -trimpath -tags=badgerdb -o=. -ldflags="-w -s -X=go.vocdoni.io/dvote/internal.Version=$(git describe --always --tags --dirty --match='v[0-9]*') -X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn" -mod=readonly $BUILDARGS \
13+
go build -trimpath -tags=badgerdb -o=. -ldflags="-w -s -X=go.vocdoni.io/dvote/internal.Version=$(git describe --always --tags --dirty --match='v[0-9]*')" -mod=readonly $BUILDARGS \
1414
./cmd/dvotenode ./cmd/vochaintest
1515

1616
FROM debian:10.10-slim AS test

Diff for: go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ require (
1616
github.com/arnaucube/go-blindsecp256k1 v0.0.0-20210203222605-876755a714c3
1717
github.com/cosmos/iavl v0.15.3
1818
github.com/deroproject/graviton v0.0.0-20200906044921-89e9e09f9601
19+
github.com/dgraph-io/badger/v2 v2.2007.3 // indirect
1920
github.com/dgraph-io/badger/v3 v3.2011.1
2021
github.com/ethereum/go-ethereum v1.9.26-0.20201212163632-00d10e610f9f
2122
github.com/frankban/quicktest v1.13.0

Diff for: go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,8 @@ github.com/dgraph-io/badger v1.6.2/go.mod h1:JW2yswe3V058sS0kZ2h/AXeDSqFjxnZcRrV
247247
github.com/dgraph-io/badger/v2 v2.2007.1/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE=
248248
github.com/dgraph-io/badger/v2 v2.2007.2 h1:EjjK0KqwaFMlPin1ajhP943VPENHJdEz1KLIegjaI3k=
249249
github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE=
250+
github.com/dgraph-io/badger/v2 v2.2007.3 h1:Sl9tQWz92WCbVSe8pj04Tkqlm2boW+KAxd+XSs58SQI=
251+
github.com/dgraph-io/badger/v2 v2.2007.3/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE=
250252
github.com/dgraph-io/badger/v3 v3.2011.1 h1:Hmyof0WMEF/QtutX5SQHzIMnJQxb/IrSzhjckV2SD6g=
251253
github.com/dgraph-io/badger/v3 v3.2011.1/go.mod h1:0rLLrQpKVQAL0or/lBLMQznhr6dWWX7h5AKnmnqx268=
252254
github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=

0 commit comments

Comments
 (0)