Merge pull request #193 from hanna-kruppe/ci-fixes

Various CI fixes

Author: vorner

.github/actions-rs/grcov.yml

@@ -12,6 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions-rs/audit-check@35b7b53b1e25b55642157ac01b4adceb5b9ebef3
+      - uses: rustsec/audit-check@v2.0.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          # ignoring RUSTSEC-2024-0019 because it's behind an opt-in feature and
+          # the affected types (named pipes) are not used
+          ignore: RUSTSEC-2024-0019

.github/workflows/audit.yaml

@@ -19,35 +19,20 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-          profile: minimal
-          default: true
+        run: rustup update stable
 
-      - name: Pre-installing grcov
-        uses: actions-rs/install@v0.1
-        with:
-          crate: grcov
-          use-tool-cache: true
+      - name: Install cargo-llvm-cov
+        uses: taiki-e/install-action@cargo-llvm-cov
 
       - name: Restore cache
         uses: Swatinem/rust-cache@v1
 
-      - name: Run tests
-        run: cargo test --all --all-features
-        env:
-          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'
-          # This seems not to work, the C code can't seem to find the gcov functions. By not providing this, we probably give up coverage from these :-(
-          #CFLAGS: --coverage
-          #CXXFLAGS: --coverage
-
-      - name: Generate coverage
-        uses: actions-rs/grcov@v0.1
+      - name: Generate code coverage
+        run: cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info
 
       - name: Upload to codecov.io
         uses: codecov/codecov-action@5a8bb4701eca7ba3673f21664b887f652c58d0a3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+          files: lcov.info
+          fail_ci_if_error: true

.github/workflows/coverage.yaml

@@ -28,6 +28,12 @@ jobs:
           - 1.36.0
           # Introduction of non_exhaustive, used at certain exfiltrators
           - 1.40.0
+        exclude:
+          # macos-latest is aarch64, old Rust doesn't know that target
+          - os: macos-latest
+            rust: 1.36.0
+          - os: macos-latest
+            rust: 1.40.0
 
     runs-on: ${{ matrix.os }}
 
@@ -36,11 +42,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: ${{ matrix.rust }}
-          default: true
-          profile: minimal
+        run: |
+          rustup toolchain add ${{ matrix.rust }} --profile minimal
+          rustup default ${{ matrix.rust }}
 
       - name: Restore cache
         uses: Swatinem/rust-cache@v1
@@ -50,6 +54,7 @@ jobs:
           RUST_VERSION: ${{ matrix.rust }}
           OS: ${{ matrix.os }}
         run: ./ci-check.sh
+        shell: bash
 
   rustfmt:
     name: Check formatting
@@ -59,12 +64,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          default: true
-          components: rustfmt
+        run: |
+          rustup update stable
+          rustup component add rustfmt
 
       - run: cargo fmt --all -- --check
 
@@ -76,19 +78,13 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          default: true
+        run: rustup update stable
 
       - name: Restore cache
         uses: Swatinem/rust-cache@v1
 
       - name: Install cargo-deadlinks
-        uses: actions-rs/install@v0.1
-        with:
-          crate: cargo-deadlinks
-          use-tool-cache: true
+        run: cargo install cargo-deadlinks
 
       - name: Check links
         run: |
@@ -104,28 +100,25 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-latest
           - windows-latest
+          # no macos-latest because that's aarch64 and old Rust lacks that target
+          # no macos-15-intel because of weird linker errors
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout
         uses: actions/checkout@v2
 
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.26.0
-          default: true
-          profile: minimal
-
-      - name: Restore cache
-        uses: Swatinem/rust-cache@v1
+        run: |
+          rustup toolchain install 1.26.0 --profile minimal
+          rustup default 1.26.0
 
       - name: Check compilation
         run: |
           rm Cargo.toml
           cd signal-hook-registry
           sed -i -e '/signal-hook =/d' Cargo.toml
+          sed -i -e 's/libc = "^0.2"/libc = "=0.2.156"/' Cargo.toml
           cargo check
 
   ancient:
@@ -134,26 +127,23 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-latest
           - windows-latest
+          # no macos-latest because that's aarch64 and old Rust lacks that target
+          # no macos-15-intel because of weird linker errors
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout
         uses: actions/checkout@v2
 
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.31.0
-          default: true
-          profile: minimal
-
-      - name: Restore cache
-        uses: Swatinem/rust-cache@v1
+        run: |
+          rustup toolchain update 1.31.0 --profile minimal
+          rustup default 1.31.0
 
       - name: Check compilation
         run: |
           rm Cargo.lock
+          sed -i -e 's/libc = "^0.2"/libc = "=0.2.156"/' Cargo.toml
           cargo update
           cargo check --no-default-features
 
@@ -166,18 +156,14 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
-          components: clippy
+        run: rustup toolchain update stable --profile minimal --component clippy
 
       - name: Restore cache
         uses: Swatinem/rust-cache@v1
 
       - name: Run clippy linter
-        run: cargo clippy --all --all-features --tests -- -D clippy::all -D warnings
+        # cfg(clippy) is necessary in signal-hook-registry because Rust 1.26 doesn't support allow(clippy::foo)
+        run: cargo clippy --all --all-features --tests -- -D clippy::all -D warnings -A clippy::unnecessary_clippy_cfg
 
   # There's bunch of platforms that have some weird quirks (or we don't know
   # that they don't). While fully compiling and testing on them is a bit of a
@@ -190,20 +176,18 @@ jobs:
       matrix:
         target:
           - x86_64-unknown-linux-musl
-          - x86_64-pc-solaris
           - x86_64-linux-android
           - aarch64-linux-android
           - arm-linux-androideabi
-          - mips-unknown-linux-musl
+          - s390x-unknown-linux-gnu
           - x86_64-unknown-netbsd
           - x86_64-unknown-freebsd
         extra-args:
           - "--all --all-features"
         include:
           # - wasm32-wasi (not yet? Or not ever?)
           # - x86_64-unknown-redox (Is that platform even usable on stable?)
-          - { target: x86_64-fuchsia, extra-args: "--all-features" }
-          - { target: asmjs-unknown-emscripten, extra-args: "--all-features" }
+          - { target: x86_64-unknown-fuchsia, extra-args: "--all-features" }
           # Seems we have some trouble with properly running C compiler on these. Might as well be problem with cross-compilation setup, but who knows
           # So we avoid the exfiltrator part/signal-hook-sys :-(
           - { target: x86_64-apple-darwin, extra-args: "--features=iterator --all --exclude signal-hook-sys" }
@@ -215,19 +199,17 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        run: |
+          rustup update stable
+          rustup target add ${{ matrix.target }}
+
+      - name: Install cross
+        uses: taiki-e/install-action@v2
         with:
-          toolchain: stable
-          profile: minimal
-          default: true
-          target: ${{ matrix.target }}
+          tool: cross@0.2.5
 
       - name: Restore cache
         uses: Swatinem/rust-cache@v1
 
       - name: Run the check
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: ${{ matrix.extra-args }} --tests --target=${{ matrix.target }}
-          use-cross: true
+        run: cross check ${{ matrix.extra-args }} --tests --target=${{ matrix.target }}

.github/workflows/test.yaml

@@ -12,6 +12,7 @@ readme = "README.md"
 keywords = ["signal", "unix", "daemon"]
 license = "MIT OR Apache-2.0"
 edition = "2018"
+rust-version = "1.31"
 
 [badges]
 maintenance = { status = "actively-developed" }
@@ -31,14 +32,15 @@ members = [
     "signal-hook-tokio",
     "signal-hook-mio",
     "signal-hook-async-std",
+    "serial_test",
 ]
 
 [dependencies]
 libc = "^0.2"
 signal-hook-registry = { version = "^1.4", path = "signal-hook-registry" }
 
 [dev-dependencies]
-serial_test = "^3"
+serial_test = { path = "./serial_test" }
 
 [package.metadata.docs.rs]
 all-features = true

Cargo.lock

@@ -1,8 +1,11 @@
 #[cfg(feature = "extended-siginfo-raw")]
 fn main() {
-    cc::Build::new()
-        .file("src/low_level/extract.c")
-        .compile("extract");
+    // Only supported for non-Windows targets
+    if std::env::var_os("CARGO_CFG_WINDOWS").is_none() {
+        cc::Build::new()
+            .file("src/low_level/extract.c")
+            .compile("extract");
+    }
 }
 
 #[cfg(not(feature = "extended-siginfo-raw"))]

Cargo.toml

@@ -8,6 +8,12 @@
 set -ex
 
 rm -f Cargo.lock
+
+if [ "$RUST_VERSION" = 1.36.0 ] || [ "$RUST_VERSION" = 1.40.0 ] ; then
+	sed -i -e 's/libc = "^0.2"/libc = "=0.2.156"/' Cargo.toml
+	sed -i -e 's/cc = { version = "^1"/cc = { version = "=1.0.79"/' Cargo.toml
+fi
+
 cargo build --all --exclude signal-hook-async-std --exclude signal-hook-tokio
 
 if [ "$RUST_VERSION" = 1.36.0 ] ; then