From 23272826478508d775f2a0d5f1d4aa9a7a823db5 Mon Sep 17 00:00:00 2001 From: Rigidity Date: Tue, 27 Aug 2024 15:09:51 -0400 Subject: [PATCH] Test combined and some other tweaks --- .github/workflows/build-wheels.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 1b4e748c5..1a659fae9 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -291,26 +291,26 @@ jobs: run: | source <(cargo llvm-cov show-env --export-prefix) export CARGO_TARGET_DIR=$CARGO_LLVM_COV_TARGET_DIR - export CARGO_INCREMENTAL=1 + export CARGO_INCREMENTAL=0 cargo llvm-cov clean --workspace - cargo test --workspace --all-features --release maturin develop --release -m wheel/Cargo.toml pytest --cov=chia_rs tests --cov-report lcov + cargo test --workspace --all-features --release cargo llvm-cov report --release --lcov --output-path rust.lcov - - name: Upload Rust to Coveralls - uses: coverallsapp/github-action@v2 - env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - with: - path-to-lcov: ./rust.lcov + - name: Install lcov + run: apt-get install -y lcov + + - name: Combine coverage + run: | + lcov -a coverage.lcov -a rust.lcov -o combined.lcov - - name: Upload Python to Coveralls + - name: Upload to Coveralls uses: coverallsapp/github-action@v2 env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} with: - path-to-lcov: ./coverage.lcov + path-to-lcov: ./combined.lcov upload: name: Upload to PyPI (${{ matrix.os.name }} ${{ matrix.python.major-dot-minor }} ${{ matrix.arch.name }})