Merge pull request pingcap#3 from windtalker/hanfei/join

merge master
ichn-hu · May 6, 2020 · b17edac · b17edac
2 parents 59279b9 + dbfd283
commit b17edac
Show file tree

Hide file tree

Showing 4 changed files with 353 additions and 309 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   go:
     docker:
-      - image: circleci/golang:stretch
+      - image: circleci/golang:1.13-stretch
     environment:
       PROTOC_VERSION: "3.5.1"
     working_directory: /go/src/github.com/pingcap/tipb

diff --git a/Cargo.toml b/Cargo.toml
@@ -6,17 +6,16 @@ edition = "2018"
 [features]
 default = ["protobuf-codec"]
 protobuf-codec = ["protobuf-build/protobuf-codec"]
-prost-codec = ["prost", "prost-derive", "bytes", "lazy_static", "protobuf-build/prost-codec"]
+prost-codec = ["prost", "prost-derive", "lazy_static", "protobuf-build/prost-codec"]
 
 [lib]
 name = "tipb"
 
 [dependencies]
 protobuf = "2"
-prost = { version = "0.5", optional = true }
-prost-derive = { version = "0.5", optional = true }
-bytes = { version = "0.4", optional = true }
+prost = { version = "0.6", optional = true }
+prost-derive = { version = "0.6", optional = true }
 lazy_static = { version = "1.3", optional = true }
 
 [build-dependencies]
-protobuf-build = { version = "0.10", default-features = false }
+protobuf-build = { version = "0.11.0", default-features = false }