From: Victor Julien <vjulien@oisf.net>
Date: Wed, 20 Mar 2024 10:02:44 +0000 (+0100)
Subject: rust: add MSRV as rust-version
X-Git-Tag: suricata-8.0.0-beta1~1604
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2c817243f73a719ec9dabb43659d336ae3ecfcf;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 3f3fd1241e..42f6d79a97 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -32,9 +32,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:
@@ -2322,9 +2319,6 @@ 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@b4ffde65f46336ab88eb53be808477a3936bae11
       - uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427
         with:
@@ -2334,6 +2328,9 @@ jobs:
         with:
           name: cbindgen
           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 03a475ed58..0d0fabb39d 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"]