diff options
| author | Jack Lloyd <[email protected]> | 2017-09-16 15:11:24 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-09-16 15:11:24 -0400 |
| commit | ab3fa2a93bec6b179041a33d93493a6beb647695 (patch) | |
| tree | d6c7b72a1d86bdb0c2cee10470c7e4ac62eeae30 /src | |
| parent | 83932f30ff02d285c8a7e2a363601f460d55d268 (diff) | |
Small tweaks for CI
Diffstat (limited to 'src')
| -rwxr-xr-x | src/scripts/ci/setup_travis.sh | 3 | ||||
| -rw-r--r-- | src/scripts/ci/travis.yml | 5 | ||||
| -rwxr-xr-x | src/scripts/ci_build.py | 4 |
3 files changed, 8 insertions, 4 deletions
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: [email protected] - 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 """ |