diff options
| author | Emilia Kasper <emilia@openssl.org> | 2016-03-07 15:15:20 +0100 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2016-03-07 22:08:23 +0100 |
| commit | 210efa8badbd5365e1aec3f901c396434ae605be (patch) | |
| tree | 6239ab159173e3d6e90b7f8315fa1d1d94c313ae | |
| parent | Revert "Allow OPENSSL_NO_SOCK in e_os.h even for non-Windows/DOS platforms" (diff) | |
| download | openssl-210efa8badbd5365e1aec3f901c396434ae605be.tar.xz openssl-210efa8badbd5365e1aec3f901c396434ae605be.zip | |
Trim Travis config part 3
- Only build & test two configurations. Make all the
other build variants buildonly on gcc (clang on osx).
- Don't build with default clang at all on linux.
- Only use gcc-5 and clang-3.6 for the sanitizer builds. Re-running
e.g. CONFIG_OPTS="shared" with them seems redundant.
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | .travis.yml | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index f43bd1007d..c642319d26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,18 +18,16 @@ os: compiler: - clang - - clang-3.6 - gcc - - gcc-5 env: - - CONFIG_OPTS="" - CONFIG_OPTS="shared" - - CONFIG_OPTS="no-pic" - CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2" + - CONFIG_OPTS="" BUILDONLY="yes" - CONFIG_OPTS="--unified" BUILDONLY="yes" - CONFIG_OPTS="--unified shared" BUILDONLY="yes" - - CONFIG_OPTS="--unified --debug --strict-warnings enable-rc5 enable-md2" BUILDONLY="yes" + - CONFIG_OPTS="no-pic" BUILDONLY="yes" + - CONFIG_OPTS="no-engine" BUILDONLY="yes" matrix: include: @@ -46,21 +44,16 @@ matrix: compiler: gcc-5 env: CONFIG_OPTS="no-asm --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2" - os: linux - compiler: clang - env: CONFIG_OPTS="no-engine" BUILDONLY="yes" - - os: linux compiler: i686-w64-mingw32-gcc env: CONFIG_OPTS="no-pic" - os: linux compiler: x86_64-w64-mingw32-gcc env: CONFIG_OPTS="no-pic" exclude: - - os: osx - compiler: clang-3.6 + - os: linux + compiler: clang - os: osx compiler: gcc - - os: osx - compiler: gcc-5 before_script: - sh .travis-create-release.sh $TRAVIS_OS_NAME |