Hi,
On 27-05-18 21:00, Ilya Shipitsin wrote:
> Both "compiler" and "exclude" are redundant, so remove them.
> Add openssl-1.0.1u to build matrix. Enable explicit apt update
> (it was disabled by default in travis-ci).
>
> Signed-off-by: Ilya Shipitsin <chipits...@gmail.com>
>
> --
> v2: Add openssl-1.0.1u to build matrix (thanks to Steffan Karger),
> Add explicit apt-get update (it was disabled by default in travis-ci)
> ---
> ---
> .travis.yml | 17 ++++++++---------
> 1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index 51645924..216f0a04 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -5,9 +5,6 @@ os: linux
>
> language: c
>
> -compiler:
> - - gcc
> -
> env:
> global:
> - JOBS=3
> @@ -15,10 +12,10 @@ env:
> - TAP_WINDOWS_VERSION=9.21.2
> - LZO_VERSION=2.10
> - PKCS11_HELPER_VERSION=1.22
> - - MBEDTLS_VERSION="2.5.1"
> + - MBEDTLS_VERSION="2.8.0"
> - MBEDTLS_CFLAGS="-I${PREFIX}/include"
> - MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto"
> - - OPENSSL_VERSION="1.0.2l"
> + - OPENSSL_VERSION="1.0.2o"
> - OPENSSL_CFLAGS="-I${PREFIX}/include"
> - OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto"
> # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
> @@ -30,13 +27,16 @@ matrix:
> - env: SSLLIB="openssl" RUN_COVERITY="1"
> os: linux
> compiler: gcc
> - - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0f"
> + - env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u"
> + os: linux
> + compiler: gcc
> + - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h"
> os: linux
> compiler: gcc
> - env: SSLLIB="openssl" CFLAGS="-fsanitize=address"
> os: linux
> compiler: clang
> - - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0f"
> + - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h"
> os: linux
> compiler: clang
> - env: SSLLIB="mbedtls"
> @@ -65,11 +65,10 @@ matrix:
> - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small"
> os: linux
> compiler: clang
> - exclude:
> - - compiler: gcc
>
> addons:
> apt:
> + update: true
> packages:
> - liblzo2-dev
> - libpam0g-dev
>
Thanks. This looks good to me.
Acked-by: Steffan Karger <stef...@karger.me>
-Steffan
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
