mirror of
https://github.com/openssl/openssl.git
synced 2025-02-17 14:32:04 +08:00
Update master Travis to Trusty
This gets us a newer Clang, and newer Go.
1.1.0 already runs on Trusty without issues.
To do this, we need to disable afalgeng in the -Werror build.
afalgeng isn't compatible with the -Werror build on
Travis Trusty due to kernel header mismatch.
(See also 97043e46aa
)
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
parent
96a5d7fdba
commit
703324a7e7
35
.travis.yml
35
.travis.yml
@ -1,3 +1,6 @@
|
||||
dist: trusty
|
||||
sudo: required
|
||||
|
||||
language: c
|
||||
cache: ccache
|
||||
|
||||
@ -10,7 +13,7 @@ addons:
|
||||
apt:
|
||||
packages:
|
||||
- ccache
|
||||
- golang
|
||||
- golang-1.6
|
||||
|
||||
os:
|
||||
- linux
|
||||
@ -21,7 +24,7 @@ compiler:
|
||||
|
||||
env:
|
||||
- CONFIG_OPTS="" DESTDIR="_install" TESTS="-test_fuzz"
|
||||
- CONFIG_OPTS="no-asm -Werror --debug no-shared enable-crypto-mdebug enable-rc5 enable-md2" TESTS="-test_fuzz"
|
||||
- CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2" TESTS="-test_fuzz"
|
||||
- CONFIG_OPTS="no-asm --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes"
|
||||
|
||||
matrix:
|
||||
@ -40,11 +43,11 @@ matrix:
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- clang-3.6
|
||||
- clang-3.9
|
||||
sources:
|
||||
- llvm-toolchain-precise-3.6
|
||||
- llvm-toolchain-trusty-3.9
|
||||
- ubuntu-toolchain-r-test
|
||||
compiler: clang-3.6
|
||||
compiler: clang-3.9
|
||||
env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes"
|
||||
- os: linux
|
||||
addons:
|
||||
@ -68,31 +71,31 @@ matrix:
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- clang-3.6
|
||||
- clang-3.9
|
||||
sources:
|
||||
- llvm-toolchain-precise-3.6
|
||||
- llvm-toolchain-trusty-3.9
|
||||
- ubuntu-toolchain-r-test
|
||||
compiler: clang-3.6
|
||||
compiler: clang-3.9
|
||||
env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan"
|
||||
- os: linux
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- clang-3.6
|
||||
- clang-3.9
|
||||
sources:
|
||||
- llvm-toolchain-precise-3.6
|
||||
- llvm-toolchain-trusty-3.9
|
||||
- ubuntu-toolchain-r-test
|
||||
compiler: clang-3.6
|
||||
compiler: clang-3.9
|
||||
env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
|
||||
- os: linux
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- clang-3.6
|
||||
- clang-3.9
|
||||
sources:
|
||||
- llvm-toolchain-precise-3.6
|
||||
- llvm-toolchain-trusty-3.9
|
||||
- ubuntu-toolchain-r-test
|
||||
compiler: clang-3.6
|
||||
compiler: clang-3.9
|
||||
env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
|
||||
- os: linux
|
||||
addons:
|
||||
@ -149,7 +152,7 @@ before_script:
|
||||
export CROSS_COMPILE=${CC%%gcc}; unset CC;
|
||||
$srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
|
||||
else
|
||||
if which ccache >/dev/null && [ "$CC" != clang-3.6 ]; then
|
||||
if which ccache >/dev/null && [ "$CC" != clang-3.9 ]; then
|
||||
CC="ccache $CC";
|
||||
fi;
|
||||
$srcdir/config -v $CONFIG_OPTS;
|
||||
@ -173,6 +176,8 @@ script:
|
||||
- $make
|
||||
- if [ -z "$BUILDONLY" ]; then
|
||||
if [ -n "$CROSS_COMPILE" ]; then
|
||||
sudo dpkg --add-architecture i386;
|
||||
sudo apt-get update;
|
||||
sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine;
|
||||
export EXE_SHELL="wine" WINEPREFIX=`pwd`;
|
||||
fi;
|
||||
|
Loading…
Reference in New Issue
Block a user