commit message adjusted пт, 15 мая 2020 г. в 22:02, Илья Шипицин <[email protected]>:
> > > пт, 15 мая 2020 г. в 20:07, Willy Tarreau <[email protected]>: > >> Ilya, >> >> > also, I'd suggest to purge travis-ci cache (if you are build in your own >> > fork). >> > some travis related issue might be related when something is took from >> > cache (which was not supposed to happen) >> >> Could you please handle Martin's patch, possibly cut it into several >> pieces if relevant and add a commit message indicating what it does >> (and why) ? Martin is not at ease with Git (which is not a problem), >> and it seems only him and you understand how the reasons of the changes >> in his patch. At least it's totally unclear to me why there's a new >> install target for arm64 and why there's a special "make" invocation >> there. >> >> Feel free to add your "purge cache" change as an extra patch if needed. >> But in any case, please make sure it's still possible to follow the >> impact of each change, because we've touched many things blindly for >> a while on this arm64 issue and most of the changes were basically >> "let's see if this helps", which is a real mess :-/ >> > > I will resend a patch with detailed information. > > > as for "purge a cache", it was a suggestion to Martin to purge it manually > in his own travis-ci project. > it usually helps to find caveats (for example, you still get files from > cache which is not desireable) > > it's just for pre-checkin test. > > > >> >> Thanks! >> Willy >> >
From 98849dc14e08f1c1fb8899145e1ed24118bb1d8b Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov <[email protected]> Date: Fri, 15 May 2020 23:34:46 +0500 Subject: [PATCH] CI: travis-ci: switch arm64 builds to use openssl from distro there are ongoing arm64 failures in travis-ci. we suspect that build stucks on scripts/build-ssl.sh which is called during build. let us try to use openssl from ubuntu distro and not build it ourselves. to achive that we add "install" section without build-ssl.sh --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea7168624..e2a32a2b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,14 +44,15 @@ matrix: compiler: clang env: TARGET=linux-glibc OPENSSL_VERSION=1.1.1f CC=clang-9 - os: linux + # The ARM64 build uses openssl and libssl-dev from Ubuntu repository. They come preinstalled by TravisCI! arch: arm64 if: type == push compiler: clang - env: TARGET=linux-glibc OPENSSL_VERSION=1.1.1f CC=clang-9 - addons: - apt: - update: true - packages: [ liblua5.3-dev, libsystemd-dev, clang-9, socat ] + env: TARGET=linux-glibc OPENSSL_VERSION=1.1.1f CC=clang-9 SSL_LIB=/usr/lib SSL_INC=/usr/include + install: + - git clone https://github.com/VTest/VTest.git ../vtest + # Special flags due to: https://github.com/vtest/VTest/issues/12 + - make -C ../vtest FLAGS="-O2 -s -Wall" - os: linux arch: s390x if: type == push @@ -113,7 +114,7 @@ install: - git clone https://github.com/VTest/VTest.git ../vtest # Special flags due to: https://github.com/vtest/VTest/issues/12 - make -C ../vtest FLAGS="-O2 -s -Wall" - - travis_wait 60 bash -c 'scripts/build-ssl.sh >build-ssl.log 2>&1' || (cat build-ssl.log && exit 1) + - travis_wait bash -c 'scripts/build-ssl.sh >build-ssl.log 2>&1' || (cat build-ssl.log && exit 1) script: - if [ "${CC%-*}" = "clang" ]; then export FLAGS="$FLAGS USE_OBSOLETE_LINKER=1" DEBUG_CFLAGS="-g -fsanitize=address" LDFLAGS="-fsanitize=address"; fi -- 2.26.2
