From: Victor Julien <vjulien@oisf.net>
Date: Wed, 20 Mar 2024 09:34:05 +0000 (+0100)
Subject: rust: add MSRV as rust-version
X-Git-Tag: suricata-6.0.18~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10674%2Fhead;p=thirdparty%2Fsuricata.git

rust: add MSRV as rust-version

Update github-actions to use it for the MSRV check.
---

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"]