From 3c994cc67fdfe92a48601e066c3de6b7e95ee62d Mon Sep 17 00:00:00 2001 From: Jonathan Simms Date: Thu, 19 Jul 2018 13:18:42 -0400 Subject: [PATCH] a single job in the travis-ci matrix for building with rust enabled (#161) lgtm --- .travis.yml | 11 +++++++++++ ci/before-install.sh | 4 +++- ci/run.sh | 13 ++++++++++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b864a10fb..41c2b344e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,6 +54,17 @@ matrix: - gcc-5 - libsubunit-dev + # gcc 5 on linux + - env: + - C_COMPILER=gcc-5 + - RUST_ENABLED=1 + addons: + apt: + <<: *apt + packages: + - gcc-5 + - libsubunit-dev + # clang 3.6 on linux - env: - C_COMPILER=clang-3.6 diff --git a/ci/before-install.sh b/ci/before-install.sh index 0af64ac52..cff9327c3 100755 --- a/ci/before-install.sh +++ b/ci/before-install.sh @@ -26,4 +26,6 @@ fi export CC="$C_COMPILER" -# curl https://sh.rustup.rs -sSf | sh -s -- -y +if [[ -n "${RUST_ENABLED:-}" ]]; then + curl https://sh.rustup.rs -sSf | sh -s -- -y +fi diff --git a/ci/run.sh b/ci/run.sh index 9e4e9a203..588bbc0b2 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -7,7 +7,18 @@ die() { echo "fatal: $*" >&2; exit 1; } export PATH=$HOME/.cargo/bin:$PATH -mkdir -p _build && ( cd _build && cmake -D BUILD_AND_INSTALL_CHECK=yes .. && make -j && make check ) +cmake_cmd=( + cmake + -DBUILD_AND_INSTALL_CHECK=yes +) + +if [[ -n "${RUST_ENABLED:-}" ]]; then + cmake_cmd+=( -DHAVE_RUST=yes -DRUST_VERBOSE_BUILD=yes ) +fi + +export RUST_BACKTRACE=full + +mkdir -p _build && ( cd _build && "${cmake_cmd[@]}" .. && make -j && make check ) RESULT=$? egrep -r ":F:|:E:" . |grep -v 'Binary file' || true