From 50adbdecbe6254405b9690a1e7cf94395198128b Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Wed, 20 May 2020 13:08:19 +0900 Subject: [PATCH 1/5] CI: Only run the server benchmark to avoid SIGKILL --- .github/workflows/bench.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 04fe83f66..1a2ee496b 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -20,3 +20,4 @@ jobs: uses: actions-rs/cargo@v1 with: command: bench + args: --bench=server From 864fc489ce642f56cf4dc3647ab3d7dc837701d8 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Wed, 20 May 2020 22:33:25 +0900 Subject: [PATCH 2/5] CI: Reduce sample size --- .github/workflows/bench.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 1a2ee496b..ce8a7da7e 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -20,4 +20,4 @@ jobs: uses: actions-rs/cargo@v1 with: command: bench - args: --bench=server + args: --bench=server -- --sample-size=15 From 83914279050de378e95abc89415628fb468b1ca8 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 21 May 2020 09:51:32 +0900 Subject: [PATCH 3/5] http: Update `base64` to 0.12 --- actix-http/CHANGES.md | 2 +- actix-http/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md index 1a71a0bc0..636c9e330 100644 --- a/actix-http/CHANGES.md +++ b/actix-http/CHANGES.md @@ -6,9 +6,9 @@ * Bump minimum supported Rust version to 1.40 * content_length function is removed, and you can set Content-Length by calling no_chunking function [#1439] - * `BodySize::Sized64` variant has been removed. `BodySize::Sized` now receives a `u64` instead of a `usize`. +* Update `base64` dependency to 0.12 ### Fixed diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml index 894bd44f8..3ddc5181c 100644 --- a/actix-http/Cargo.toml +++ b/actix-http/Cargo.toml @@ -49,7 +49,7 @@ actix-threadpool = "0.3.1" actix-tls = { version = "2.0.0-alpha.1", optional = true } actix = { version = "0.10.0-alpha.1", optional = true } -base64 = "0.11" +base64 = "0.12" bitflags = "1.2" bytes = "0.5.3" copyless = "0.1.4" From 603973dedeaf1801a849c17a627a238b2d05dc8a Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 21 May 2020 09:51:58 +0900 Subject: [PATCH 4/5] awc: Update `base64` to 0.12 --- awc/CHANGES.md | 1 + awc/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/awc/CHANGES.md b/awc/CHANGES.md index 67bbc38c5..f501674ee 100644 --- a/awc/CHANGES.md +++ b/awc/CHANGES.md @@ -6,6 +6,7 @@ * Implement `std::error::Error` for our custom errors [#1422] * Bump minimum supported Rust version to 1.40 +* Update `base64` dependency to 0.12 [#1422]: https://github.com/actix/actix-web/pull/1422 diff --git a/awc/Cargo.toml b/awc/Cargo.toml index c31c19025..894674c90 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -39,7 +39,7 @@ actix-service = "1.0.1" actix-http = "2.0.0-alpha.3" actix-rt = "1.0.0" -base64 = "0.11" +base64 = "0.12" bytes = "0.5.3" derive_more = "0.99.2" futures-core = { version = "0.3.5", default-features = false } From 6c78f57a70236b91e2ab14df98d4d152f8a2b7f7 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 21 May 2020 09:52:15 +0900 Subject: [PATCH 5/5] test-server: Update dependencies --- test-server/CHANGES.md | 2 ++ test-server/Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test-server/CHANGES.md b/test-server/CHANGES.md index 1570e36d8..e97ee5d6f 100644 --- a/test-server/CHANGES.md +++ b/test-server/CHANGES.md @@ -7,6 +7,8 @@ * Make `test_server` `async` fn. * Bump minimum supported Rust version to 1.40 * Replace deprecated `net2` crate with `socket2` +* Update `base64` dependency to 0.12 +* Update `env_logger` dependency to 0.7 ## [1.0.0] - 2019-12-13 diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml index ebfbd55cd..f4b02353c 100644 --- a/test-server/Cargo.toml +++ b/test-server/Cargo.toml @@ -39,12 +39,12 @@ actix-server = "1.0.0" actix-testing = "1.0.0" awc = "2.0.0-alpha.1" -base64 = "0.11" +base64 = "0.12" bytes = "0.5.3" futures-core = { version = "0.3.5", default-features = false } http = "0.2.0" log = "0.4" -env_logger = "0.6" +env_logger = "0.7" socket2 = "0.3" serde = "1.0" serde_json = "1.0"