travis-ci: cleanup, refactor, upgrade ssl libraries
PATCH v2 1/1 travis-ci: cleanup, refactor, upgrade ssl libraries
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).
--
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(-)
.travis.yml +8 -9
@@ -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
Signature · 1 line
2.14.3
Hi,
Quoted 64 lines · Ilya Shipitsin
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 <[email protected]...>--
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(-).travis.yml +7
-7@@ -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
.travis.yml matrix: · line 74
Quoted 10 lines
.travis.yml +1
-2compiler: clang - exclude: - - compiler: gcc addons: apt: + update: true packages: - liblzo2-dev - libpam0g-dev
Thanks. This looks good to me.
-Steffan
Your patch has been applied to the master branch.
commit c5108260b3699ab01638452ef3c9bef5193e265a
Author: Ilya Shipitsin Date: Mon May 28 00:00:57 2018 +0500
travis-ci: cleanup, refactor, upgrade ssl libraries
Signed-off-by: Ilya Shipitsin <[email protected]...>
Acked-by: Steffan Karger <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg16898.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
Hi,
.travis.yml env: · line 15
Quoted 2 lines · Ilya Shipitsin
.travis.yml +1
-1- - MBEDTLS_VERSION="2.5.1" + - MBEDTLS_VERSION="2.8.0"
I know travis-ci currently is caching both the downloaded tarball and the built library, therefore my question: what will happen to mbedtls-2.5.1-*? Will that be wiped after some time? Or do we need to wipe the cache manually?
Cheers,
Signature · 1 line
Antonio Quartulli
Someone who has admin rights, can purge the cache
Quoted 17 lines · Antonio Quartulli
Hi,
.travis.yml env: · line 15
Quoted 2 lines · Ilya Shipitsin
.travis.yml +1
-1- - MBEDTLS_VERSION="2.5.1" + - MBEDTLS_VERSION="2.8.0"I know travis-ci currently is caching both the downloaded tarball and the built library, therefore my question: what will happen to mbedtls-2.5.1-*? Will that be wiped after some time? Or do we need to wipe the cache manually?
Cheers,
--
Antonio Quartulli
Quoted 1 line · Илья Шипицин
Someone who has admin rights, can purge the cache
Done. As this is very easy to do, I'm fine with doing this manually every now and then after we change our dependency versions.
-Steffan