From: Jason Ish <ish@unx.ca>
Date: Thu, 8 Jun 2017 19:32:40 +0000 (-0600)
Subject: travis: add rust 1.7.0 build
X-Git-Tag: suricata-4.0.0-rc1~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ba406d39e4b18a0128f28203449124e10329d0;p=thirdparty%2Fsuricata.git

travis: add rust 1.7.0 build

One build with Rust 1.7.0, our oldest that we'll support as its
whats bundled with Ubuntu 16.04. Create another build that will use
the latest stable.
---

diff --git a/.travis.yml b/.travis.yml
index 66c39ff1d8..7558f01e9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,10 +47,8 @@ matrix:
     - os: linux
       compiler: gcc
       env:
-        - NAME="linux,gcc,cocci,rust"
+        - NAME="linux,gcc,cocci"
         - *default-cflags
-        - ENABLE_RUST="yes"
-        - ARGS="--enable-rust"
       addons:
         apt:
           sources:
@@ -58,6 +56,23 @@ matrix:
           packages:
             - *packages
             - coccinelle
+    # Linux, gcc, Rust (latest stable).
+    - os: linux
+      compiler: gcc
+      env:
+        - NAME="linux,gcc,rust"
+        - *default-cflags
+        - ENABLE_RUST="yes"
+        - ARGS="--enable-rust"
+    # Linux, gcc, Rust (1.7.0 - oldest supported).
+    - os: linux
+      compiler: gcc
+      env:
+        - NAME="linux,gcc,rust-1.7.0"
+        - *default-cflags
+        - ENABLE_RUST="yes"
+        - RUST_VERSION="1.7.0"
+        - ARGS="--enable-rust"
     # Linux, gcc, -DNDEBUG.
     - os: linux
       compiler: gcc
@@ -139,11 +154,15 @@ script:
     fi
 
 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
     fi
-  - export PATH=$HOME/.cargo/bin:$PATH
   - |
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
         brew update