diff --git a/.github/workflows/cov.yml b/.github/workflows/cov.yml index 010df083a..8b8e39887 100644 --- a/.github/workflows/cov.yml +++ b/.github/workflows/cov.yml @@ -31,10 +31,10 @@ jobs: run: cargo llvm-cov clean --workspace - name: Code coverage (glommio) - run: cargo +nightly llvm-cov --no-report --all --no-default-features --features="glommio,cookie,url,compress,openssl,rustls,ws" + run: cargo +nightly llvm-cov --no-report --all --no-default-features --features="glommio,cookie,url,compress,openssl,rustls,ws,brotli" - name: Code coverage - run: cargo +nightly llvm-cov --no-report --all --doctests --no-default-features --features="tokio,cookie,url,compress,openssl,rustls,ws" + run: cargo +nightly llvm-cov --no-report --all --doctests --no-default-features --features="tokio,cookie,url,compress,openssl,rustls,ws,brotli" - name: Generate coverage report run: cargo +nightly llvm-cov report --lcov --output-path lcov.info --ignore-filename-regex="ntex-tokio|ntex-glommio|ntex-async-std" diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c1111192d..610d8848a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -28,32 +28,37 @@ jobs: override: true - name: Generate Cargo.lock - uses: actions-rs/cargo@v1 + uses: actions-rs/cargo@v4 with: command: generate-lockfile - # - name: Cache vcpkg - # uses: actions/cache@v1 - # with: - # path: C:\vcpkg\installed\x64-windows\ - # key: x86_64-pc-windows-msvc-openssl + - name: Cache vcpkg + uses: actions/cache@v1 + with: + path: C:\vcpkg\installed\x64-windows\ + key: x86_64-pc-windows-msvc-openssl - name: Cache cargo registry - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.cargo/registry key: ${{ matrix.version }}-x86_64-pc-windows-msvc-cargo-registry-trimmed-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo index - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.cargo/git key: ${{ matrix.version }}-x86_64-pc-windows-msvc-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }} + - name: Install cmake + uses: lukka/get-cmake@latest + + - name: Install nasm + uses: ilammy/setup-nasm@v1 + - name: Install OpenSSL run: | vcpkg integrate install - vcpkg install cmake:x64-windows vcpkg install openssl:x64-windows Copy-Item C:\vcpkg\installed\x64-windows\bin\libcrypto-3-x64.dll C:\vcpkg\installed\x64-windows\bin\libcrypto.dll Copy-Item C:\vcpkg\installed\x64-windows\bin\libssl-3-x64.dll C:\vcpkg\installed\x64-windows\bin\libssl.dll