Skip to content

rust: update msrv to 1.85 - v6 #15328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jasonish wants to merge 12 commits into
base: main
Choose a base branch
from
+127 −47
Open

rust: update msrv to 1.85 - v6 #15328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
063555b
github-ci: cleanups to almalinux minimal build
jasonish Mar 17, 2026
ae15f33
github-ci: break ubuntu/debian script into 2 scripts
jasonish Mar 18, 2026
ace0e89
rust: set minimum rust version to 1.85
jasonish Mar 13, 2026
c198edf
rust: disable clippy warning for manual c str literals
jasonish Mar 13, 2026
83ef0cd
github-ci: update rust vars job to rust 1.85
jasonish Mar 13, 2026
58c1417
github-ci/nix: update to nixos-25.11
jasonish Mar 13, 2026
ea70fd1
github-ci/formatting: update to rust 1.89
jasonish Mar 13, 2026
da20643
github-ci/scan-build: update to rust 1.85
jasonish Mar 13, 2026
b6f7d68
github-ci/commits: update to ubuntu 24.04; rust 1.89
jasonish Mar 15, 2026
8f5aab6
github-ci/docs: use rust 1.89
jasonish Mar 15, 2026
976c543
github-ci/builds: update ubuntu builds to rust 1.89
jasonish Mar 18, 2026
fc968c9
rust: set CARGO_ENV when generating ffi bindings
jasonish Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 75 additions & 26 deletions .github/workflows/builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,9 +1317,6 @@ jobs:
name: dist
- run: tar xf suricata-*.tar.gz --strip-components=1

- name: Update packages and install sudo
run: dnf -y update && dnf install -y sudo

- name: Install AlmaLinux 9 extra repositories
run: |
dnf -y update
Expand All @@ -1338,6 +1335,8 @@ jobs:
runs-on: ubuntu-latest
container: ubuntu:24.04
needs: [prepare-deps]
env:
RV: "1.89"
steps:
- name: Cache ~/.cargo
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
Expand All @@ -1355,7 +1354,7 @@ jobs:
autoconf \
automake \
build-essential \
cargo \
cargo-${RV} \
cbindgen \
clang-14 \
coccinelle \
Expand Down Expand Up @@ -1387,10 +1386,10 @@ jobs:
parallel \
python-is-python3 \
python3-yaml \
rustc \
software-properties-common \
zlib1g \
zlib1g-dev
- run: echo "/usr/lib/rust-${RV}/bin" >> $GITHUB_PATH
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: git config --global --add safe.directory /__w/suricata/suricata
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
Expand Down Expand Up @@ -1434,7 +1433,7 @@ jobs:
autoconf \
automake \
build-essential \
cargo-1.82 \
cargo-1.85 \
cbindgen \
clang-14 \
dpdk-dev \
Expand Down Expand Up @@ -1478,7 +1477,7 @@ jobs:
- run: tar xf prep/suricata-update.tar.gz
- run: tar xf prep/suricata-verify.tar.gz
- run: ./autogen.sh
- run: CARGO=cargo-1.82 RUSTC=rustc-1.82 RUSTDOC=rustdoc-1.82 ./configure --enable-unittests
- run: CARGO=cargo-1.85 RUSTC=rustc-1.85 RUSTDOC=rustdoc-1.85 ./configure --enable-unittests
- run: make -j ${{ env.CPUS }}
- run: make check
- run: python3 ./suricata-verify/run.py -q --debug-failed
Expand Down Expand Up @@ -1701,6 +1700,7 @@ jobs:
# specific version to match up to the llvm version in ubuntu below
- name: Install Rust
run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.85.1 -y
- run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: git config --global --add safe.directory /__w/suricata/suricata
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
Expand Down Expand Up @@ -1905,6 +1905,8 @@ jobs:
image: ubuntu:24.04
options: --privileged
needs: [prepare-deps, prepare-cbindgen]
env:
RV: "1.89"
steps:
- name: Cache ~/.cargo
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
Expand All @@ -1923,7 +1925,7 @@ jobs:
autoconf \
automake \
llvm-18-dev \
cargo \
cargo-${RV} \
cbindgen \
clang-18 \
git \
Expand Down Expand Up @@ -1952,7 +1954,6 @@ jobs:
make \
parallel \
python3-yaml \
rustc \
software-properties-common \
sudo \
zlib1g \
Expand All @@ -1963,6 +1964,7 @@ jobs:
time \
wget \
dpdk-dev
- run: echo "/usr/lib/rust-${RV}/bin" >> $GITHUB_PATH
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: git config --global --add safe.directory /__w/suricata/suricata
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
Expand Down Expand Up @@ -2150,6 +2152,8 @@ jobs:
image: ubuntu:24.04
options: --privileged
needs: [prepare-deps, prepare-cbindgen]
env:
RV: "1.89"
steps:
- name: Cache ~/.cargo
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
Expand All @@ -2168,7 +2172,7 @@ jobs:
autoconf \
automake \
llvm-18-dev \
cargo \
cargo-${RV} \
cbindgen \
clang-18 \
git \
Expand Down Expand Up @@ -2198,7 +2202,6 @@ jobs:
make \
parallel \
python3-yaml \
rustc \
software-properties-common \
sudo \
zlib1g \
Expand All @@ -2209,6 +2212,7 @@ jobs:
time \
wget \
dpdk-dev
- run: echo "/usr/lib/rust-${RV}/bin" >> $GITHUB_PATH
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: git config --global --add safe.directory /__w/suricata/suricata
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
Expand Down Expand Up @@ -2360,11 +2364,13 @@ jobs:
files: coverage.lcov
flags: fuzzcorpus

ubuntu-20-04-ndebug:
name: Ubuntu 20.04 (-DNDEBUG)
ubuntu-24-04-ndebug:
name: Ubuntu 24.04 (-DNDEBUG)
runs-on: ubuntu-latest
container: ubuntu:20.04
container: ubuntu:24.04
needs: [prepare-deps, prepare-cbindgen]
env:
RV: "1.89"
steps:
- name: Cache ~/.cargo
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
Expand All @@ -2382,7 +2388,7 @@ jobs:
build-essential \
autoconf \
automake \
cargo \
cargo-${RV} \
git \
hwloc \
libhwloc-dev \
Expand All @@ -2404,17 +2410,16 @@ jobs:
libjansson-dev \
libevent-dev \
libevent-pthreads-2.1-7 \
libpython2.7 \
libpcre2-dev \
make \
parallel \
python3-yaml \
rustc \
software-properties-common \
zlib1g \
zlib1g-dev \
exuberant-ctags \
dpdk-dev
- run: echo "/usr/lib/rust-${RV}/bin" >> $GITHUB_PATH
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: git config --global --add safe.directory /__w/suricata/suricata
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
Expand Down Expand Up @@ -2517,6 +2522,8 @@ jobs:
image: ubuntu:22.04
options: --privileged
needs: [prepare-deps, prepare-cbindgen]
env:
RV: "1.89"
steps:

# Cache Rust stuff.
Expand All @@ -2537,7 +2544,7 @@ jobs:
build-essential \
autoconf \
automake \
cargo \
cargo-${RV} \
git \
hwloc \
libhwloc-dev \
Expand All @@ -2562,12 +2569,12 @@ jobs:
make \
parallel \
python3-yaml \
rustc \
software-properties-common \
sudo \
zlib1g \
zlib1g-dev \
exuberant-ctags
- run: echo "/usr/lib/rust-${RV}/bin" >> $GITHUB_PATH
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: git config --global --add safe.directory /__w/suricata/suricata
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
Expand Down Expand Up @@ -2600,6 +2607,8 @@ jobs:
runs-on: ubuntu-22.04
container: ubuntu:22.04
needs: [prepare-deps, prepare-cbindgen]
env:
RV: "1.89"
steps:

# Cache Rust stuff.
Expand All @@ -2622,7 +2631,7 @@ jobs:
build-essential \
autoconf \
automake \
cargo \
cargo-${RV} \
git \
hwloc \
libhwloc-dev \
Expand All @@ -2646,7 +2655,7 @@ jobs:
software-properties-common \
zlib1g \
zlib1g-dev
- run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
- run: echo "/usr/lib/rust-${RV}/bin:$HOME/.cargo/bin" >> $GITHUB_PATH
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: git config --global --add safe.directory /__w/suricata/suricata
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
Expand Down Expand Up @@ -2782,7 +2791,43 @@ jobs:
- run: apt update -y && apt install -y sudo

- name: Install minimal dependencies
run: ./scripts/docs-ubuntu-debian-minimal-build.sh
run: ./scripts/docs-ubuntu-minimal-build.sh

# Set the path, the export in the example script does not work
# in GitHub actions.
- run: echo "/usr/lib/rust-1.89/bin:$PATH" >> $GITHUB_PATH

- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure
- run: make -j ${{ env.CPUS }}
- run: ./src/suricata --build-info # check if we can run Suricata

debian-13-minimal-recommended-build:
name: Debian 13 (Minimal/Recommended Build)
needs: [ubuntu-22-04-dist]
runs-on: ubuntu-latest
container: debian:13
steps:
# Cache Rust stuff.
- name: Cache cargo registry
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
with:
path: ~/.cargo/registry
key: cargo-registry

- name: Determine number of CPUs
run: echo CPUS=$(nproc --all) >> $GITHUB_ENV

- name: Download suricata.tar.gz
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
with:
name: dist
- run: tar xvf suricata-*.tar.gz --strip-components=1

# Install packages required by the install script.
- run: apt update -y && apt install -y sudo

- name: Install minimal dependencies
run: ./scripts/docs-debian-minimal-build.sh

- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure
- run: make -j ${{ env.CPUS }}
Expand All @@ -2796,6 +2841,8 @@ jobs:
strategy:
matrix:
dpdk_version: [ 24.11.3, 23.11.5, 22.11.10, 21.11.9 ]
env:
RV: "1.89"
steps:

# Cache Rust stuff.
Expand All @@ -2816,7 +2863,7 @@ jobs:
build-essential \
autoconf \
automake \
cargo \
cargo-${RV} \
git \
hwloc \
libhwloc-dev \
Expand All @@ -2841,7 +2888,6 @@ jobs:
make \
parallel \
python3-yaml \
rustc \
software-properties-common \
zlib1g \
zlib1g-dev \
Expand Down Expand Up @@ -2873,6 +2919,7 @@ jobs:
ninja -C build install
ldconfig
cd $HOME
- run: echo "/usr/lib/rust-${RV}/bin" >> $GITHUB_PATH
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: git config --global --add safe.directory /__w/suricata/suricata
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
Expand Down Expand Up @@ -3081,6 +3128,8 @@ jobs:
runs-on: ubuntu-latest
container: ubuntu:22.04
needs: [prepare-deps, prepare-cbindgen]
env:
RV: "1.89"
steps:
# Cache Rust stuff.
- name: Cache cargo registry
Expand All @@ -3098,7 +3147,7 @@ jobs:
autoconf \
automake \
build-essential \
cargo \
cargo-${RV} \
cmake \
curl \
git \
Expand Down Expand Up @@ -3126,7 +3175,6 @@ jobs:
pkg-config \
python3 \
python3-yaml \
rustc \
sphinx-doc \
sphinx-common \
texlive-latex-base \
Expand All @@ -3135,6 +3183,7 @@ jobs:
texlive-latex-extra \
zlib1g \
zlib1g-dev
- run: echo "/usr/lib/rust-${RV}/bin" >> $GITHUB_PATH
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: git config --global --add safe.directory /__w/suricata/suricata
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/commits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
check-commits:
name: Commit Check
runs-on: ubuntu-latest
container: ubuntu:20.04
container: ubuntu:24.04
steps:
- name: Caching ~/.cargo
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
Expand All @@ -32,7 +32,7 @@ jobs:
build-essential \
autoconf \
automake \
cargo \
cargo-1.89 \
curl \
git \
jq \
Expand All @@ -52,17 +52,16 @@ jobs:
libjansson-dev \
libevent-dev \
libevent-pthreads-2.1-7 \
libpython2.7 \
libssl-dev \
make \
parallel \
pkg-config \
python3-yaml \
rustc \
software-properties-common \
zlib1g \
zlib1g-dev
- run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
- run: echo "/usr/lib/rust-1.89/bin" >> $GITHUB_PATH
- name: Installing sccache
run: |
(cd /tmp && curl -OL https://github.com/mozilla/sccache/releases/download/0.2.13/sccache-0.2.13-x86_64-unknown-linux-musl.tar.gz)
Expand Down
Loading
Loading