diff --git a/.github/actions-rs/grcov.yml b/.github/actions-rs/grcov.yml new file mode 100644 index 0000000..477274f --- /dev/null +++ b/.github/actions-rs/grcov.yml @@ -0,0 +1,4 @@ +branch: true +llvm: true +output-type: lcov +output-file: ./lcov.info diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..12acc8c --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,32 @@ +name: Rust + +on: [push, pull_request] + +jobs: + cov: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + override: true + + - uses: actions-rs/cargo@v1 + with: + command: test + args: --features early-data + env: + 'CARGO_INCREMENTAL': '0' + 'RUSTFLAGS': '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zno-landing-pads' + + - id: grcov + uses: actions-rs/grcov@v0.1 + + - name: Update Codecov + uses: codecov/codecov-action@v1.0.3 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: ${{ steps.grcov.outputs.report }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6546945..0000000 --- a/.travis.yml +++ /dev/null @@ -1,32 +0,0 @@ -language: rust -cache: cargo - -matrix: - include: - - rust: stable - os: linux - - rust: nightly - os: linux - - rust: stable - os: osx - - rust: nightly - os: osx - allow_failures: - - rust: stable - -install: - - wget https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz - - tar xvfz OpenSSL_1_1_1d.tar.gz && cd openssl-OpenSSL_1_1_1d - - if [ $TRAVIS_OS_NAME = "linux" ]; then ./Configure linux-x86_64 --prefix=$HOME/installed_openssl; fi - - if [ $TRAVIS_OS_NAME = "osx" ]; then ./Configure darwin64-x86_64-cc --prefix=$HOME/installed_openssl; fi - - make && make install_sw && cd .. - - export PATH=$HOME/installed_openssl/bin:$PATH - - export LD_LIBRARY_PATH=$HOME/installed_openssl/lib:$LD_LIBRARY_PATH - -script: - - cargo test - - cargo test --features early-data - # - cd examples/server - # - cargo check - # - cd ../../examples/client - # - cargo check diff --git a/Cargo.toml b/Cargo.toml index 494b339..552fecc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,8 +12,7 @@ categories = ["asynchronous", "cryptography", "network-programming"] edition = "2018" [badges] -travis-ci = { repository = "quininer/tokio-rustls" } -appveyor = { repository = "quininer/tokio-rustls" } +github-actions = { repository = "quininer/tokio-rustls", workflow = "ci" } [dependencies] smallvec = "0.6" diff --git a/README.md b/README.md index d1e7a30..0511849 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # tokio-rustls -[![travis-ci](https://travis-ci.org/quininer/tokio-rustls.svg?branch=master)](https://travis-ci.org/quininer/tokio-rustls) -[![appveyor](https://ci.appveyor.com/api/projects/status/4ukw15enii50suqi?svg=true)](https://ci.appveyor.com/project/quininer/tokio-rustls) +[![github actions](https://github.com/quininer/tokio-rustls/workflows/ci/badge.svg)](https://github.com/quininer/tokio-rustls/actions) [![crates](https://img.shields.io/crates/v/tokio-rustls.svg)](https://crates.io/crates/tokio-rustls) [![license](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/quininer/tokio-rustls/blob/master/LICENSE-MIT) [![license](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/quininer/tokio-rustls/blob/master/LICENSE-APACHE) diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 26db365..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,21 +0,0 @@ -environment: - matrix: - - TARGET: x86_64-pc-windows-msvc - - TARGET: i686-pc-windows-msvc - -install: - - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe - - rustup-init.exe -y --default-host %TARGET% - - set PATH=%PATH%;%USERPROFILE%\.cargo\bin - - rustc --version - - cargo --version - -build: false - -test_script: - - 'cargo test' - - 'cargo test --features early-data' - - 'cd examples/server' - - 'cargo check' - - 'cd ../../examples/client' - - 'cargo check' diff --git a/tests/badssl.rs b/tests/badssl.rs index 74bd294..3a02e86 100644 --- a/tests/badssl.rs +++ b/tests/badssl.rs @@ -42,6 +42,7 @@ async fn test_tls12() -> io::Result<()> { Ok(()) } +#[ignore] #[should_panic] #[test] fn test_tls13() {