From: Jason Ish <ish@unx.ca>
Date: Fri, 22 Mar 2019 13:45:47 +0000 (-0600)
Subject: travis-ci: enable Rust for all builds
X-Git-Tag: suricata-5.0.0-beta1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2fedc9ed2cae4e4a36cf0a9dbe8e3530c3e89c9;p=thirdparty%2Fsuricata.git

travis-ci: enable Rust for all builds
---

diff --git a/.travis.yml b/.travis.yml
index a380d54d69..37710deb57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,6 @@ matrix:
     - env:
         - NAME="linux,gcc,rust-stable"
         - *default-cflags
-        - ENABLE_RUST="yes"
         - RUST_VERSION="stable"
         - ARGS="--enable-rust --enable-rust-strict"
         - DO_CHECK_SETUP_SCRIPTS="yes"
@@ -84,7 +83,6 @@ matrix:
       env:
         - NAME="linux,gcc,rust-stable"
         - *default-cflags
-        - ENABLE_RUST="yes"
         - RUST_VERSION="stable"
         - ARGS="--enable-rust --enable-rust-strict"
         - DO_CHECK_SETUP_SCRIPTS="yes"
@@ -96,7 +94,6 @@ matrix:
       env:
         - NAME="linux,gcc,rust-1.31.0-disabled"
         - *default-cflags
-        - ENABLE_RUST="yes"
         - RUST_VERSION="1.31.0"
         - ARGS="--disable-rust"
         - DO_DISTCHECK="yes"
@@ -107,7 +104,6 @@ matrix:
       env:
         - NAME="linux,gcc,rust-1.31.0-auto"
         - *default-cflags
-        - ENABLE_RUST="yes"
         - RUST_VERSION="1.31.0"
         - ARGS=""
         - DO_DISTCHECK="yes"
@@ -118,7 +114,6 @@ matrix:
       env:
         - NAME="linux,gcc,rust-1.31.0"
         - *default-cflags
-        - ENABLE_RUST="yes"
         - RUST_VERSION="1.31.0"
         - ARGS="--enable-rust --enable-rust-strict"
         - DO_DISTCHECK="yes"
@@ -128,7 +123,6 @@ matrix:
       env:
         - NAME="linux,gcc,rust-1.24.1"
         - *default-cflags
-        - ENABLE_RUST="yes"
         - RUST_VERSION="1.24.1"
         - ARGS="--enable-rust --enable-rust-strict"
         - DO_DISTCHECK="yes"
@@ -248,13 +242,11 @@ script:
 before_install:
   - export PATH=$HOME/.cargo/bin:$PATH
   - |
-    if [[ "$ENABLE_RUST" == "yes" ]]; then
-        curl https://sh.rustup.rs -sSf | sh -s -- -y
-        if [[ "$RUST_VERSION" != "" ]]; then
-            rustup override set $RUST_VERSION
-        fi
-        rustc --version
+    curl https://sh.rustup.rs -sSf | sh -s -- -y
+    if [[ "$RUST_VERSION" != "" ]]; then
+        rustup override set $RUST_VERSION
     fi
+    rustc --version
   - |
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
         brew update