Skip to content

Commit 19a53b5

Browse files
authored
*: bump 0.6.0 (#467)
Signed-off-by: Jay <[email protected]>
1 parent 253fa3f commit 19a53b5

File tree

8 files changed

+60
-19
lines changed

8 files changed

+60
-19
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,16 @@ jobs:
104104
- run: go version ; cargo version ; cmake --version
105105
- run: scripts/reset-submodule.cmd
106106
- run: cargo build
107-
- run: cargo test --all
107+
- run: cargo test --all
108+
109+
Pre-Release:
110+
name: Pre-Release
111+
runs-on: ubuntu-latest
112+
steps:
113+
- uses: actions/checkout@v2
114+
- run: scripts/reset-submodule.cmd
115+
- run: cd grpc-sys && cargo publish --dry-run
116+
- name: Check generated package size
117+
run: |
118+
ls -alh target/package/grpcio-sys-*.crate
119+
test `cat target/package/grpcio-sys-*.crate | wc -c` -le 10485760

CHANGELOG.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# 0.6.0 - 2020-06-12
2+
3+
- Switch to std::future (#447)
4+
- Update gRPC C core to 1.29.1 (#466)
5+
- Change spinlock to parking_lot::Mutex (#468)
6+
7+
# 0.5.3 - 2020-05-07
8+
9+
- Switch to github action and update badge (#459)
10+
- Enable ALPN by default (#456)
11+
112
# grpcio-sys 0.5.2 - 2020-03-31
213

314
- Downgrade bindgen version to be backward compatible. (#452)
@@ -8,7 +19,7 @@
819
- Support unix domain socket (#446)
920
- Build: fix rebuild rules for no prebuilt bindings (#450)
1021

11-
# 0.5.0 - 2019-03-16
22+
# 0.5.0 - 2020-03-16
1223

1324
- Make `build_args` and `channel_args` public (#405)
1425
- Reclaim buffer memory after sending message (#407)

Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "grpcio"
3-
version = "0.5.1"
3+
version = "0.6.0"
44
edition = "2018"
55
authors = ["The TiKV Project Developers"]
66
license = "Apache-2.0"
@@ -17,7 +17,7 @@ autoexamples = false
1717
all-features = true
1818

1919
[dependencies]
20-
grpcio-sys = { path = "grpc-sys", version = "0.5.0" }
20+
grpcio-sys = { path = "grpc-sys", version = "0.6.0" }
2121
libc = "0.2"
2222
futures = "0.3"
2323
protobuf = { version = "2.0", optional = true }
@@ -45,4 +45,5 @@ debug = true
4545
travis-ci = { repository = "tikv/grpc-rs" }
4646

4747
[patch.crates-io]
48-
grpcio-compiler = { path = "compiler", version = "0.5.0", default-features = false }
48+
grpcio-compiler = { path = "compiler", version = "0.6.0", default-features = false }
49+
protobuf-build = { git = "https://github.com/tikv/protobuf-build.git" }

README.md

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ This project is still under development. The following features with the check m
2626
## Prerequisites
2727

2828
- CMake >= 3.8.0
29-
- Rust >= 1.19.0
29+
- Rust >= 1.36.0
3030
- binutils >= 2.22
3131
- LLVM and Clang >= 3.9 if you need to generate bindings at compile time.
32-
- By default, the [secure feature](#feature-secure) is provided by boringssl, which requires Go (>=1.7) to build. You can also use openssl instead by enabling [openssl feature](#feature-openssl).
32+
- By default, the [secure feature](#feature-secure) is provided by boringssl. You can also use openssl instead by enabling [openssl feature](#feature-openssl).
3333

3434
For Linux and MacOS, you also need to install gcc (or clang) too.
3535

36-
Bindings are pre-generated for x86_64 Linux. For other platforms, bindings are generated at compile time.
36+
Bindings are pre-generated for x86_64/arm64 Linux. For other platforms, bindings are generated at compile time.
3737

3838
For Windows, you also need to install following software:
3939

@@ -90,7 +90,7 @@ To include this project as a dependency:
9090

9191
```
9292
[dependencies]
93-
grpcio = "0.4"
93+
grpcio = "0.6"
9494
```
9595

9696
### Feature `secure`
@@ -100,10 +100,17 @@ mechanism. When you do not need it, for example when working in intranet,
100100
you can disable it by using the following configuration:
101101
```
102102
[dependencies]
103-
grpcio = { version = "0.4", default-features = false, features = ["protobuf-codec"] }
103+
grpcio = { version = "0.6", default-features = false, features = ["protobuf-codec"] }
104104
```
105105

106-
### Feature `openssl`
106+
### Feature `prost-codec` and `protobuf-codec`
107+
108+
`gRPC-rs` uses `protobuf` crate by default. If you want to use `prost` instead, you can enable
109+
`prost-codec` feature. You probably only want to enable only one of the two features. Though
110+
grpcio is completely fine with both features enabled at the same time, grpcio-compiler
111+
will not going to work as expected.
112+
113+
### Feature `openssl` and `openssl-vendored`
107114

108115
`gRPC-rs` comes vendored with `gRPC Core`, which by default uses BoringSSL
109116
instead of OpenSSL. This may cause linking issues due to symbol clashes and/or
@@ -113,9 +120,12 @@ your `Cargo.toml`'s features list for `gprcio`, which requires openssl (>=1.0.2)
113120

114121
```toml
115122
[dependencies]
116-
grpcio = { version = "0.4.4", features = ["openssl"] }
123+
grpcio = { version = "0.6", features = ["openssl"] }
117124
```
118125

126+
Feature `openssl-vendored` is the same as feature `openssl` except it will build openssl from
127+
bundled sources.
128+
119129
## Performance
120130

121131
See [benchmark](https://github.com/tikv/grpc-rs/tree/master/benchmark) to find out how to run a benchmark by yourself.

compiler/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "grpcio-compiler"
3-
version = "0.5.0"
3+
version = "0.6.0"
44
edition = "2018"
55
authors = ["The TiKV Project Developers"]
66
license = "Apache-2.0"

grpc-sys/Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "grpcio-sys"
3-
version = "0.5.2"
3+
version = "0.6.0"
44
authors = ["The TiKV Project Developers"]
55
license = "Apache-2.0"
66
keywords = ["grpc", "bindings"]
@@ -26,8 +26,14 @@ exclude = [
2626
"grpc/src/ruby/*",
2727
"grpc/test/core/end2end/*",
2828
"grpc/third_party/zlib/*",
29+
"grpc/third_party/abseil-cpp/absl/time/internal/cctz/testdata",
2930
"grpc/third_party/benchmark/*",
3031
"grpc/third_party/bloaty/*",
32+
"grpc/third_party/boringssl-with-bazel/crypto_test_data.cc",
33+
"grpc/third_party/boringssl-with-bazel/src/fuzz",
34+
"grpc/third_party/boringssl-with-bazel/src/crypto/cipher_extra/test",
35+
"grpc/third_party/boringssl-with-bazel/src/third_party/wycheproof_testvectors",
36+
"grpc/third_party/boringssl-with-bazel/src/third_party/googletest",
3137
"grpc/third_party/libuv/*",
3238
"grpc/third_party/gflags/*",
3339
"grpc/third_party/googletest/*",

proto/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "grpcio-proto"
3-
version = "0.5.0"
3+
version = "0.6.0"
44
edition = "2018"
55
authors = ["The TiKV Project Developers"]
66
license = "Apache-2.0"
@@ -19,7 +19,7 @@ prost-codec = ["prost-derive", "bytes", "lazy_static", "grpcio/prost-codec", "pr
1919

2020
[dependencies]
2121
futures = "0.3"
22-
grpcio = { path = "..", features = ["secure"], version = "0.5.0", default-features = false }
22+
grpcio = { path = "..", features = ["secure"], version = "0.6.0", default-features = false }
2323
bytes = { version = "0.5", optional = true }
2424
prost = { version = "0.6", optional = true }
2525
prost-derive = { version = "0.6", optional = true }

tests-and-examples/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,28 @@ name = "tests-and-examples"
33
version = "0.1.0"
44
edition = "2018"
55
autoexamples = false
6+
publish = false
67

78
[features]
89
default = ["protobuf-codec"]
910
protobuf-codec = ["protobuf", "grpcio/protobuf-codec", "grpcio-proto/protobuf-codec"]
1011
prost-codec = ["prost", "bytes", "grpcio/prost-codec", "grpcio-proto/prost-codec"]
1112

1213
[dependencies]
13-
grpcio-sys = { path = "../grpc-sys", version = "0.5.0" }
14+
grpcio-sys = { path = "../grpc-sys", version = "0.6.0" }
1415
libc = "0.2"
1516
futures = "0.3"
1617
protobuf = { version = "2.0", optional = true }
1718
prost = { version = "0.6", optional = true }
1819
bytes = { version = "0.5", optional = true }
1920
log = "0.4"
20-
grpcio = { path = "..", version = "0.5.0", default-features = false, features = ["secure"] }
21+
grpcio = { path = "..", version = "0.6.0", default-features = false, features = ["secure"] }
2122

2223
[dev-dependencies]
2324
serde_json = "1.0"
2425
serde = "1.0"
2526
serde_derive = "1.0"
26-
grpcio-proto = { path = "../proto", version = "0.5.0", default-features = false }
27+
grpcio-proto = { path = "../proto", version = "0.6.0", default-features = false }
2728
rand = "0.7"
2829
slog = "2.0"
2930
slog-async = "2.1"

0 commit comments

Comments
 (0)