Commit 31c1db92 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

.travis.yml: make package pulls conditional. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2292)
parent 01b76c2c

.travis.yml

+66 −9
Original line number Diff line number Diff line
@@ -10,15 +10,7 @@ addons: 
    apt:

        packages:

            - ccache

            - clang-3.6

            - gcc-5

            - g++-5

            - golang

            - binutils-mingw-w64

            - gcc-mingw-w64

        sources:

            - llvm-toolchain-precise-3.6

            - ubuntu-toolchain-r-test



os:

    - linux
@@ -38,33 +30,99 @@ env: 
matrix:

    include:

        - os: linux

          addons:

              apt:

                  packages:

                      - clang-3.6

                  sources:

                      - llvm-toolchain-precise-3.6

                      - ubuntu-toolchain-r-test

          compiler: clang-3.6

          env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes"

        - os: linux

          addons:

              apt:

                  packages:

                      - gcc-5

                      - g++-5

                  sources:

                      - ubuntu-toolchain-r-test

          compiler: gcc-5

          env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers enable-external-tests no-shared -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-5"

        - os: linux

          addons:

              apt:

                  packages:

                      - clang-3.6

                  sources:

                      - llvm-toolchain-precise-3.6

                      - ubuntu-toolchain-r-test

          compiler: clang-3.6

          env: CONFIG_OPTS="enable-msan"

        - os: linux

          addons:

              apt:

                  packages:

                      - clang-3.6

                  sources:

                      - llvm-toolchain-precise-3.6

                      - ubuntu-toolchain-r-test

          compiler: clang-3.6

          env: 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

                  sources:

                      - llvm-toolchain-precise-3.6

                      - ubuntu-toolchain-r-test

          compiler: clang-3.6

          env: CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"

        - os: linux

          addons:

              apt:

                  packages:

                      - gcc-5

                      - g++-5

                  sources:

                      - ubuntu-toolchain-r-test

          compiler: gcc-5

          env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"

        - os: linux

          addons:

              apt:

                  packages:

                      - gcc-5

                      - g++-5

                  sources:

                      - ubuntu-toolchain-r-test

          compiler: gcc-5

          env: CONFIG_OPTS="--strict-warnings enable-tls1_3" COMMENT="Move to the BORINGTEST build when interoperable"

        - os: linux

          addons:

              apt:

                  packages:

                      - binutils-mingw-w64

                      - gcc-mingw-w64

          compiler: i686-w64-mingw32-gcc

          env: CONFIG_OPTS="no-stdio" BUILDONLY="yes"

        - os: linux

          addons:

              apt:

                  packages:

                      - binutils-mingw-w64

                      - gcc-mingw-w64

                      - wine

          compiler: i686-w64-mingw32-gcc

          env: CONFIG_OPTS="no-pic"

        - os: linux

          addons:

              apt:

                  packages:

                      - binutils-mingw-w64

                      - gcc-mingw-w64

                      - wine

          compiler: x86_64-w64-mingw32-gcc

          env: CONFIG_OPTS="no-pic"

    exclude:
@@ -116,7 +174,6 @@ script: 
    - $make

    - if [ -z "$BUILDONLY" ]; then

          if [ -n "$CROSS_COMPILE" ]; then

              sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine;

              export EXE_SHELL="wine" WINEPREFIX=`pwd`;

          fi;

          HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test;