From 9c44c29ef2cadb2f0ff214096ccf731ce2660d64 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 4 Feb 2016 16:40:40 +0100 Subject: [PATCH] unified build scheme: add instructions for travis to build with --unified Reviewed-by: Rich Salz --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.travis.yml b/.travis.yml index e3ab38fdc6..cb23320d38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,10 @@ env: - CONFIG_OPTS="shared" - CONFIG_OPTS="no-asm" - CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2" + - CONFIG_OPTS="--unified" + - CONFIG_OPTS="--unified shared" + - CONFIG_OPTS="--unified no-asm" + - CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2" matrix: include: @@ -61,11 +65,23 @@ matrix: env: CONFIG_OPTS="no-asm" - compiler: x86_64-w64-mingw32-gcc env: CONFIG_OPTS="no-asm" + - compiler: i686-w64-mingw32-gcc + env: CONFIG_OPTS="--unified shared" + - compiler: x86_64-w64-mingw32-gcc + env: CONFIG_OPTS="--unified shared" + - compiler: i686-w64-mingw32-gcc + env: CONFIG_OPTS="--unified no-asm" + - compiler: x86_64-w64-mingw32-gcc + env: CONFIG_OPTS="--unified no-asm" allow_failures: - compiler: i686-w64-mingw32-gcc env: CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2" - compiler: x86_64-w64-mingw32-gcc env: CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2" + - compiler: i686-w64-mingw32-gcc + env: CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2" + - compiler: x86_64-w64-mingw32-gcc + env: CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2" before_script: - sh .travis-create-release.sh $TRAVIS_OS_NAME -- 2.25.1