From a4d3e9b1a113f0472221d342ff4a6714816012d7 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Wed, 20 Mar 2024 10:34:05 +0100 Subject: [PATCH] rust: add MSRV as rust-version Update github-actions to use it for the MSRV check. --- .github/workflows/builds.yml | 6 +++--- rust/Cargo.toml.in | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 98bdea03b3..bc1ef3f560 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -1221,15 +1221,15 @@ jobs: python3-yaml \ zlib1g \ zlib1g-dev - - name: Install Rust - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain ${RUST_VERSION_MIN} -y - - run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH - name: Download suricata.tar.gz uses: actions/download-artifact@v2 with: name: dist - name: Extract run: tar zxvf suricata-*.tar.gz --strip-components=1 + - name: Install Rust + run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain $(grep rust-version rust/Cargo.toml.in|sed 's/\"//g'|awk '{print $3}') -y + - run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH - name: Configure run: CFLAGS="${DEFAULT_CFLAGS}" ./configure - name: Build diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in index 2f9a7aa59f..13c3cf21aa 100644 --- a/rust/Cargo.toml.in +++ b/rust/Cargo.toml.in @@ -2,6 +2,7 @@ name = "suricata" version = "@PACKAGE_VERSION@" edition = "2018" +rust-version = "1.41.1" [lib] crate-type = ["staticlib", "rlib"] -- 2.47.2