From 06ddad00514ffef8638cc859e532891570808063 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Thu, 25 Feb 2021 11:50:24 +0000 Subject: [PATCH] prepare rt and tls releases (#287) --- .github/workflows/ci.yml | 48 ++++++++++++------- actix-rt/CHANGES.md | 3 ++ actix-rt/Cargo.toml | 4 +- actix-rt/README.md | 9 ++++ .../examples/{basic.rs => tcp-echo.rs} | 0 actix-tls/CHANGES.md | 7 ++- actix-tls/Cargo.toml | 8 ++-- .../examples/{basic.rs => tcp-rustls.rs} | 0 8 files changed, 54 insertions(+), 25 deletions(-) rename actix-server/examples/{basic.rs => tcp-echo.rs} (100%) rename actix-tls/examples/{basic.rs => tcp-rustls.rs} (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3945573e..7b5b47c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,21 +39,21 @@ jobs: profile: minimal override: true - - name: Install MSYS2 - if: matrix.target.triple == 'x86_64-pc-windows-gnu' - uses: msys2/setup-msys2@v2 - - name: Install MinGW Packages - if: matrix.target.triple == 'x86_64-pc-windows-gnu' - run: | - msys2 -c 'pacman -Sy --noconfirm pacman' - msys2 -c 'pacman --noconfirm -S base-devel pkg-config' + # - name: Install MSYS2 + # if: matrix.target.triple == 'x86_64-pc-windows-gnu' + # uses: msys2/setup-msys2@v2 + # - name: Install MinGW Packages + # if: matrix.target.triple == 'x86_64-pc-windows-gnu' + # run: | + # msys2 -c 'pacman -Sy --noconfirm pacman' + # msys2 -c 'pacman --noconfirm -S base-devel pkg-config' - - name: Generate Cargo.lock - uses: actions-rs/cargo@v1 - with: - command: generate-lockfile - - name: Cache Dependencies - uses: Swatinem/rust-cache@v1.2.0 + # - name: Generate Cargo.lock + # uses: actions-rs/cargo@v1 + # with: + # command: generate-lockfile + # - name: Cache Dependencies + # uses: Swatinem/rust-cache@v1.2.0 - name: Install cargo-hack uses: actions-rs/cargo@v1 @@ -65,13 +65,27 @@ jobs: uses: actions-rs/cargo@v1 with: command: hack - args: --clean-per-run check --workspace --no-default-features --tests + args: check --workspace --no-default-features - - name: check full + - name: check minimal + tests + uses: actions-rs/cargo@v1 + with: + command: hack + args: check --workspace --no-default-features --tests --examples + + - name: check default uses: actions-rs/cargo@v1 with: command: check - args: --workspace --bins --examples --tests + args: --workspace --tests --examples + + - name: check full + # TODO: compile OpenSSL and run tests on MinGW + if: matrix.target.triple != 'x86_64-pc-windows-gnu' + uses: actions-rs/cargo@v1 + with: + command: check + args: --workspace --all-features --tests --examples - name: tests if: matrix.target.triple != 'x86_64-pc-windows-gnu' diff --git a/actix-rt/CHANGES.md b/actix-rt/CHANGES.md index db9e538b..1fd7b25b 100644 --- a/actix-rt/CHANGES.md +++ b/actix-rt/CHANGES.md @@ -1,6 +1,9 @@ # Changes ## Unreleased - 2021-xx-xx + + +## 2.1.0 - 2021-02-24 * Add `ActixStream` extension trait to include readiness methods. [#276] * Re-export `tokio::net::TcpSocket` in `net` module [#282] diff --git a/actix-rt/Cargo.toml b/actix-rt/Cargo.toml index 7990e67d..92f10b85 100644 --- a/actix-rt/Cargo.toml +++ b/actix-rt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-rt" -version = "2.0.2" +version = "2.1.0" authors = [ "Nikolay Kim ", "Rob Ede ", @@ -8,7 +8,7 @@ authors = [ description = "Tokio-based single-threaded async runtime for the Actix ecosystem" keywords = ["async", "futures", "io", "runtime"] homepage = "https://actix.rs" -repository = "https://github.com/actix/actix-net.git" +repository = "https://github.com/actix/actix-net" documentation = "https://docs.rs/actix-rt" categories = ["network-programming", "asynchronous"] license = "MIT OR Apache-2.0" diff --git a/actix-rt/README.md b/actix-rt/README.md index c29d563d..f9a3ed31 100644 --- a/actix-rt/README.md +++ b/actix-rt/README.md @@ -2,4 +2,13 @@ > Tokio-based single-threaded async runtime for the Actix ecosystem. +[![crates.io](https://img.shields.io/crates/v/actix-rt?label=latest)](https://crates.io/crates/actix-rt) +[![Documentation](https://docs.rs/actix-rt/badge.svg?version=2.1.0)](https://docs.rs/actix-rt/2.1.0) +[![Version](https://img.shields.io/badge/rustc-1.46+-ab6000.svg)](https://blog.rust-lang.org/2020/03/12/Rust-1.46.html) +![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-rt.svg) +
+[![dependency status](https://deps.rs/crate/actix-rt/2.1.0/status.svg)](https://deps.rs/crate/actix-rt/2.1.0) +![Download](https://img.shields.io/crates/d/actix-rt.svg) +[![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/WghFtEH6Hb) + See crate documentation for more: https://docs.rs/actix-rt. diff --git a/actix-server/examples/basic.rs b/actix-server/examples/tcp-echo.rs similarity index 100% rename from actix-server/examples/basic.rs rename to actix-server/examples/tcp-echo.rs diff --git a/actix-tls/CHANGES.md b/actix-tls/CHANGES.md index 352e79fa..824663b0 100644 --- a/actix-tls/CHANGES.md +++ b/actix-tls/CHANGES.md @@ -1,9 +1,12 @@ # Changes ## Unreleased - 2021-xx-xx + + +## 3.0.0-beta.4 - 2021-02-24 * Rename `accept::openssl::{SslStream => TlsStream}`. -* Add `connect::Connect::set_local_addr` to attach local `Ipaddr`. [#282] -* `connector::TcpConnector` service would try to bind to local_addr of `IpAddr` when given [#282] +* Add `connect::Connect::set_local_addr` to attach local `IpAddr`. [#282] +* `connector::TcpConnector` service will try to bind to local_addr of `IpAddr` when given. [#282] [#282]: https://github.com/actix/actix-net/pull/282 diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml index 92f04e06..b3a0e30c 100755 --- a/actix-tls/Cargo.toml +++ b/actix-tls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-tls" -version = "3.0.0-beta.3" +version = "3.0.0-beta.4" authors = ["Nikolay Kim "] description = "TLS acceptor and connector services for Actix ecosystem" keywords = ["network", "tls", "ssl", "async", "transport"] @@ -41,7 +41,7 @@ uri = ["http"] [dependencies] actix-codec = "0.4.0-beta.1" -actix-rt = { version = "2.0.0", default-features = false } +actix-rt = { version = "2.1.0", default-features = false } actix-service = "2.0.0-beta.4" actix-utils = "3.0.0-beta.2" @@ -69,7 +69,7 @@ features = ["vendored"] optional = true [dev-dependencies] -actix-rt = "2.0.0" +actix-rt = "2.1.0" actix-server = "2.0.0-beta.3" bytes = "1" env_logger = "0.8" @@ -78,5 +78,5 @@ log = "0.4" trust-dns-resolver = "0.20.0" [[example]] -name = "basic" +name = "tcp-rustls" required-features = ["accept", "rustls"] diff --git a/actix-tls/examples/basic.rs b/actix-tls/examples/tcp-rustls.rs similarity index 100% rename from actix-tls/examples/basic.rs rename to actix-tls/examples/tcp-rustls.rs