From ab3fa2a93bec6b179041a33d93493a6beb647695 Mon Sep 17 00:00:00 2001
From: Jack Lloyd <jack@randombit.net>
Date: Sat, 16 Sep 2017 15:11:24 -0400
Subject: Small tweaks for CI

---
 src/scripts/ci/setup_travis.sh | 3 ++-
 src/scripts/ci/travis.yml      | 5 ++---
 src/scripts/ci_build.py        | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/scripts')

diff --git a/src/scripts/ci/setup_travis.sh b/src/scripts/ci/setup_travis.sh
index 39340b962..7a57394a5 100755
--- a/src/scripts/ci/setup_travis.sh
+++ b/src/scripts/ci/setup_travis.sh
@@ -75,5 +75,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
     fi
 
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    export PATH=$PATH:botan-ci-tools/macos
+    PATH=$PATH:$(pwd)/botan-ci-tools/macos
+    export PATH
 fi
diff --git a/src/scripts/ci/travis.yml b/src/scripts/ci/travis.yml
index ad5f34b9b..a26fc3989 100644
--- a/src/scripts/ci/travis.yml
+++ b/src/scripts/ci/travis.yml
@@ -94,7 +94,7 @@ install:
   - ./src/scripts/ci/setup_travis.sh
 
 script:
-  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./src/scripts/ci_build.py --os=$TRAVIS_OS_NAME --cc=$CC --cc-bin=$CXX $BUILD_MODE; fi
+  - ./src/scripts/ci_build.py --os=$TRAVIS_OS_NAME --cc=$CC --cc-bin=$CXX --compiler-cache=ccache $BUILD_MODE
 
 # whitelist branches to avoid testing feature branches twice (as branch and as pull request)
 branches:
@@ -121,7 +121,6 @@ addons:
     project:
       name: "randombit/botan"
     notification_email: jack@randombit.net
-    build_command_prepend: "./configure.py --no-optimizations --with-zlib"
+    build_command_prepend: "./configure.py --no-optimizations --with-zlib --with-openssl"
     build_command: "make -j2"
     branch_pattern: coverity_scan
-
diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py
index bc4ea41e0..cd95e7a53 100755
--- a/src/scripts/ci_build.py
+++ b/src/scripts/ci_build.py
@@ -281,6 +281,10 @@ def have_prog(prog):
 def main(args=None):
     # pylint: disable=too-many-branches,too-many-statements,too-many-locals
 
+    if os.getenv('COVERITY_SCAN_BRANCH') is not None:
+        print('Skipping build COVERITY_SCAN_BRANCH set in environment')
+        return 0
+
     """
     Parse options, do the things
     """
-- 
cgit v1.2.3