Skip to content

rust: update msrv to 1.85 #15060

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

Closed
jasonish wants to merge 11 commits into from
Closed

rust: update msrv to 1.85 #15060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3b797f3
github-ci: cleanups to almalinux minimal build
jasonish Mar 17, 2026
2049cd6
github-ci: break ubuntu/debian script into 2 scripts
jasonish Mar 18, 2026
85890a6
rust: set minimum rust version to 1.85
jasonish Mar 13, 2026
8e4e235
rust: disable clippy warning for manual c str literals
jasonish Mar 13, 2026
6846bc5
github-ci: update rust vars job to rust 1.85
jasonish Mar 13, 2026
a03062a
github-ci/nix: update to nixos-25.11
jasonish Mar 13, 2026
d49dbbf
github-ci/formatting: update to rust 1.89
jasonish Mar 13, 2026
57419a1
github-ci/scan-build: update to rust 1.85
jasonish Mar 13, 2026
ece0e4a
github-ci/commits: update to ubuntu 24.04; rust 1.89
jasonish Mar 15, 2026
ffb3a92
github-ci/docs: use rust 1.89
jasonish Mar 15, 2026
1f2bbd4
github-ci/builds: update ubuntu builds to rust 1.89
jasonish Mar 18, 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 @@ -1318,9 +1318,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 @@ -1339,6 +1336,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 @@ -1356,7 +1355,7 @@ jobs:
autoconf \
automake \
build-essential \
cargo \
cargo-${RV} \
cbindgen \
clang-14 \
coccinelle \
Expand Down Expand Up @@ -1388,10 +1387,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@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
Expand Down Expand Up @@ -1431,7 +1430,7 @@ jobs:
autoconf \
automake \
build-essential \
cargo-1.82 \
cargo-1.85 \
cbindgen \
clang-14 \
dpdk-dev \
Expand Down Expand Up @@ -1475,7 +1474,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 @@ -1707,6 +1706,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@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
Expand Down Expand Up @@ -1929,6 +1929,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 @@ -1947,7 +1949,7 @@ jobs:
autoconf \
automake \
llvm-18-dev \
cargo \
cargo-${RV} \
cbindgen \
clang-18 \
git \
Expand Down Expand Up @@ -1976,7 +1978,6 @@ jobs:
make \
parallel \
python3-yaml \
rustc \
software-properties-common \
sudo \
zlib1g \
Expand All @@ -1987,6 +1988,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@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
Expand Down Expand Up @@ -2171,6 +2173,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 @@ -2189,7 +2193,7 @@ jobs:
autoconf \
automake \
llvm-18-dev \
cargo \
cargo-${RV} \
cbindgen \
clang-18 \
git \
Expand Down Expand Up @@ -2219,7 +2223,6 @@ jobs:
make \
parallel \
python3-yaml \
rustc \
software-properties-common \
sudo \
zlib1g \
Expand All @@ -2230,6 +2233,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@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
Expand Down Expand Up @@ -2409,11 +2413,13 @@ jobs:
parallel-finished: true
fail-on-error: false

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 @@ -2431,7 +2437,7 @@ jobs:
build-essential \
autoconf \
automake \
cargo \
cargo-${RV} \
git \
hwloc \
libhwloc-dev \
Expand All @@ -2453,17 +2459,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@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
Expand Down Expand Up @@ -2566,6 +2571,8 @@ jobs:
image: ubuntu:22.04
options: --privileged
needs: [prepare-deps, prepare-cbindgen]
env:
RV: "1.89"
steps:

# Cache Rust stuff.
Expand All @@ -2586,7 +2593,7 @@ jobs:
build-essential \
autoconf \
automake \
cargo \
cargo-${RV} \
git \
hwloc \
libhwloc-dev \
Expand All @@ -2611,12 +2618,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@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
Expand Down Expand Up @@ -2649,6 +2656,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 @@ -2671,7 +2680,7 @@ jobs:
build-essential \
autoconf \
automake \
cargo \
cargo-${RV} \
git \
hwloc \
libhwloc-dev \
Expand All @@ -2695,7 +2704,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@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
Expand Down Expand Up @@ -2831,7 +2840,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:
Copy link
Copy Markdown
Contributor

@catenacyber catenacyber Mar 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we could remove some builders because they do not bring any value...

Copy link
Copy Markdown
Member Author

@jasonish jasonish Mar 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we could remove some builders because they do not bring any value...

Yeah, probably. Killed one off a couple weeks ago as its just required a few lines added to another similar build. Probably many more like this.

But this one tests documentation as well for a popular distro, so some are hard to get rid off, even if they don't do much different than another build.

Copy link
Copy Markdown
Contributor

@catenacyber catenacyber Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was a general idea, not criticizing this PR

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 @@ -2845,6 +2890,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 @@ -2865,7 +2912,7 @@ jobs:
build-essential \
autoconf \
automake \
cargo \
cargo-${RV} \
git \
hwloc \
libhwloc-dev \
Expand All @@ -2890,7 +2937,6 @@ jobs:
make \
parallel \
python3-yaml \
rustc \
software-properties-common \
zlib1g \
zlib1g-dev \
Expand Down Expand Up @@ -2922,6 +2968,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@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
Expand Down Expand Up @@ -3129,6 +3176,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 @@ -3146,7 +3195,7 @@ jobs:
autoconf \
automake \
build-essential \
cargo \
cargo-${RV} \
cmake \
curl \
git \
Expand Down Expand Up @@ -3174,7 +3223,6 @@ jobs:
pkg-config \
python3 \
python3-yaml \
rustc \
sphinx-doc \
sphinx-common \
texlive-latex-base \
Expand All @@ -3183,6 +3231,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@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
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 \
Copy link
Copy Markdown
Contributor

@catenacyber catenacyber Mar 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we remove all these obsolete libpython2 ?

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