From 95e7246b75c8f63181fc79ef6c60ff4624cfae69 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Mon, 2 Mar 2020 17:18:50 +0100 Subject: [PATCH] rust: bump minimum supported version to 1.34.2 --- .github/workflows/builds.yml | 6 +++--- .travis.yml | 2 +- configure.ac | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 08d86b23ff..67bcea0e59 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -162,7 +162,7 @@ jobs: needs: centos-8 steps: - name: Install Rust - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.33.0 -y + run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.34.2 -y - run: echo "::add-path::$HOME/.cargo/bin" - name: Install system dependencies run: | @@ -366,7 +366,7 @@ jobs: zlib1g \ zlib1g-dev - name: Install Rust - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.33.0 -y + run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.34.2 -y - run: echo "::add-path::$HOME/.cargo/bin" - name: Download suricata.tar.gz uses: actions/download-artifact@v1 @@ -502,7 +502,7 @@ jobs: zlib1g \ zlib1g-dev - name: Install Rust - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.33.0 -y + run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.34.2 -y - run: echo "::add-path::$HOME/.cargo/bin" - name: Install cbindgen run: cargo install --force cbindgen diff --git a/.travis.yml b/.travis.yml index bea9fe9a2d..af09cce0d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,7 +81,7 @@ env: # The version of Rust that will be used if not otherwise set. - RUST_VERSION="stable" # The minimum version of Rust supported. - - RUST_VERSION_MIN="1.33.0" + - RUST_VERSION_MIN="1.34.2" # A known recent working version of stable Rust - RUST_VERSION_KNOWN="1.37.0" diff --git a/configure.ac b/configure.ac index 13074e386b..73ea32b354 100644 --- a/configure.ac +++ b/configure.ac @@ -2394,7 +2394,7 @@ fi cargo_version_output=$($CARGO --version) cargo_version=$(echo "$cargo_version_output" | sed 's/^.*[[^0-9]]\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\).*$/\1/') - MIN_RUSTC_VERSION="1.33.0" + MIN_RUSTC_VERSION="1.34.2" AC_MSG_CHECKING(for Rust version $MIN_RUSTC_VERSION or newer) AS_VERSION_COMPARE([$rustc_version], [$MIN_RUSTC_VERSION], [