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 ccaabb8e0d8b37ca2254b27232debbee507c798a..577595094050b7faa95e3ea415266c18a01f07c9 100644 (file)
--- 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 0bac7e159e0a51a21beef3394ce26c10f599af6a..347391bf671c6c2dcb2102f5b511f92ccfda8584 100644 (file)
--- 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"]