diff --git a/.cirrus.yml b/.cirrus.yml index 1fe67ae3..96ee41e9 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,15 +1,17 @@ task: only_if: $CIRRUS_BRANCH == 'master' || $CIRRUS_PR != '' + environment: + CODECOV_TOKEN: ENCRYPTED[cfd48b16731c254067ef7b39a7083384127a594c6ad52e51cc32982da2eb8cc67c0a54f69736c29559a28664c615ab99] matrix: - #- name: FreeBSD 11.3 - # freebsd_instance: - # image_family: freebsd-11-3-snap - - name: FreeBSD 12.1 + - name: FreeBSD 12.4 freebsd_instance: - image_family: freebsd-12-1-snap - - name: FreeBSD 13.0 + image_family: freebsd-12-4 + - name: FreeBSD 13.2 freebsd_instance: - image_family: freebsd-13-0-snap + image_family: freebsd-13-2 + - name: FreeBSD 14.0 + freebsd_instance: + image_family: freebsd-14-0 # Install Rust setup_script: - fetch https://sh.rustup.rs -o rustup.sh @@ -19,9 +21,6 @@ task: - rustup component add llvm-tools-preview test_script: - . $HOME/.cargo/env - - cargo test --all-features -# coverage is disabled for now -# see https://github.com/rust-lang/rust/issues/94616 -# - env LLVM_PROFILE_FILE="calloop-%p-%m.profraw" RUSTFLAGS="-Zinstrument-coverage" cargo test --all-features -# - grcov . --binary-path ./target/debug -s . -t lcov --branch --llvm --ignore-not-existing --keep-only "src/sys/*" --excl-br-start "mod tests \{" --excl-start "mod tests \{" --excl-br-line "#\[derive\(" --excl-line "#\[derive\(" -o lcov.info -# - bash -c 'bash <(curl -s https://codecov.io/bash) -f lcov.info' + - env LLVM_PROFILE_FILE="calloop-%p-%m.profraw" RUSTFLAGS="-Zinstrument-coverage" cargo test --all-features + - grcov . --binary-path ./target/debug -s . -t lcov --branch --llvm --ignore-not-existing --keep-only "src/*" --excl-br-start "mod tests \{" --excl-start "mod tests \{" --excl-br-line "#\[derive\(" --excl-line "#\[derive\(" -o lcov.info + - bash -c 'bash <(curl -s https://codecov.io/bash) -f lcov.info' -F freebsd diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f6782a7..40840190 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,6 +124,13 @@ jobs: path: target key: ${{ runner.os }}-test-${{ steps.rustcversion.outputs.version }}-${{ hashFiles('**/Cargo.toml') }} + - name: Downgrade log + uses: actions-rs/cargo@v1 + if: ${{ matrix.rust == '1.56.0' }} + with: + command: update + args: --package log --precise 0.4.16 + - name: Run tests uses: actions-rs/cargo@v1 with: diff --git a/src/sources/generic.rs b/src/sources/generic.rs index 3bfe2a8f..e4828d1a 100644 --- a/src/sources/generic.rs +++ b/src/sources/generic.rs @@ -105,7 +105,7 @@ impl Generic { interest, mode, token: None, - _error_type: PhantomData::default(), + _error_type: PhantomData, } } @@ -116,7 +116,7 @@ impl Generic { interest, mode, token: None, - _error_type: PhantomData::default(), + _error_type: PhantomData, } } }