From 4ac1a6771fd8335371290013c5bbd5e7e980531c Mon Sep 17 00:00:00 2001 From: Hilko Bengen Date: Thu, 16 May 2024 17:10:51 +0200 Subject: [PATCH] Use current stable Rust to build non-release dynamic glibc version --- .github/workflows/build.yml | 9 +++++++-- src/config.rs | 4 +--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 505841a..4d5bab3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,13 +89,18 @@ jobs: build_dynamic_glibc: runs-on: ubuntu-latest - container: debian:bookworm-slim + container: debian:trixie-slim steps: - name: Prepare run: | apt-get -qq update apt-get -qqy upgrade - apt-get -qqy install ca-certificates rustc cargo clang libacl1-dev jq file + apt-get -qqy install ca-certificates clang libacl1-dev jq file curl + - name: Install Rust toolchain (stable) + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable - uses: actions/checkout@v2 - name: Build run: | diff --git a/src/config.rs b/src/config.rs index f2e3edc..6affb9f 100644 --- a/src/config.rs +++ b/src/config.rs @@ -167,15 +167,13 @@ pub struct Filter { pub filter_action: FilterAction, } -#[derive(Debug, Serialize)] -#[derive(Default)] +#[derive(Debug, Serialize, Default)] pub enum Input { #[default] Stdin, Unix(PathBuf), } - impl std::fmt::Display for Input { fn fmt(&self, fmt: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> { match self {