From 4b10fdff1d8260696cf6a5a55b17c7e23cba7e78 Mon Sep 17 00:00:00 2001 From: Fabio Mendes Date: Thu, 3 Mar 2022 16:36:54 -0500 Subject: Workaround for missing libs on freebsd 13 Update codecov.yml Update coveralls.yml --- .github/workflows/codecov.yml | 2 +- .github/workflows/coveralls.yml | 2 +- zfs-core-sys/build.rs | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index cd18818..a8e6f2e 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -42,7 +42,7 @@ jobs: RUSTFLAGS: '-Zinstrument-coverage' LLVM_PROFILE_FILE: 'rust-libzfs-%p-%m.profraw' - - run: curl -L https://github.com/mozilla/grcov/releases/latest/download/grcov-linux-x86_64.tar.bz2 | tar jxf - + - run: curl -L https://github.com/mozilla/grcov/releases/latest/download/grcov-x86_64-unknown-linux-gnu.tar.bz2 | tar jxf - - run: ./grcov . --binary-path ./target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" -o lcov.info - run: bash <(curl -s https://codecov.io/bash) -f lcov.info - name: Run codacy-coverage-reporter diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml index 1d4782a..b38ec50 100644 --- a/.github/workflows/coveralls.yml +++ b/.github/workflows/coveralls.yml @@ -40,7 +40,7 @@ jobs: CARGO_INCREMENTAL: '0' RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests' RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests' - - run: curl -L https://github.com/mozilla/grcov/releases/latest/download/grcov-linux-x86_64.tar.bz2 | tar jxf - + - run: curl -L https://github.com/mozilla/grcov/releases/latest/download/grcov-x86_64-unknown-linux-gnu.tar.bz2 | tar jxf - - run: zip -0 ccov.zip `find . \( -name "*.gc*" \) -print` - run: ./grcov ccov.zip -s . -t lcov --llvm --branch --ignore-not-existing --ignore "/*" -o lcov.info - name: Archive code coverage results diff --git a/zfs-core-sys/build.rs b/zfs-core-sys/build.rs index cdce9e9..e82f09d 100644 --- a/zfs-core-sys/build.rs +++ b/zfs-core-sys/build.rs @@ -114,5 +114,6 @@ fn main() { println!("cargo:rustc-link-lib=nvpair"); if target_os == "freebsd" { println!("cargo:rustc-link-lib=dylib:-as-needed=zutil"); + println!("cargo:rustc-link-lib=dylib:-as-needed=spl"); } } -- cgit v1.2.3