From 58c61f1fe42d1027cf4ce9241cf114f90ce4f419 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Wed, 20 Mar 2024 11:02:44 +0100 Subject: [PATCH] rust: add MSRV as rust-version Update github-actions to use it for the MSRV check. --- .github/workflows/builds.yml | 9 +++------ rust/Cargo.toml.in | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index ccaabb8e0d..5775950940 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -28,9 +28,6 @@ env: # could cause some steps to fail. RUST_VERSION_KNOWN: "1.70.0" - # The minimum version of Rust supported. - RUST_VERSION_MIN: "1.63.0" - jobs: prepare-deps: @@ -2280,14 +2277,14 @@ jobs: texlive-latex-extra \ 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 - uses: actions/checkout@v3.5.3 - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a with: name: prep path: prep + - 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: Setup cbindgen run: | mkdir -p $HOME/.cargo/bin diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in index 0bac7e159e..347391bf67 100644 --- a/rust/Cargo.toml.in +++ b/rust/Cargo.toml.in @@ -2,6 +2,7 @@ name = "suricata" version = "@PACKAGE_VERSION@" edition = "2021" +rust-version = "1.63.0" [workspace] members = [".", "./derive"] -- 2.47.2