From 9bf2a1be89a6eaddb00f07b9d069a9a16c24c037 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sun, 19 Jan 2020 12:14:02 +0500 Subject: [PATCH] BUILD: CI: introduce ARM64 builds also several small changes: openssl-1.0.2 upgraded to 1.0.2u ppc64le upgraded to "bionic" (it was tricky part, linux-ppc64le is xenial, while arch: ppc64le is bionic). additional wait introduced for build ssl. --- .travis.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e69f441667..9046e6dcd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,11 @@ env: addons: apt: - packages: [ liblua5.3-dev, libsystemd-dev, libpcre2-dev ] + update: true + packages: [ liblua5.3-dev, libsystemd-dev, libpcre2-dev, socat ] + homebrew: + update: true + packages: [ socat ] cache: directories: @@ -29,11 +33,18 @@ cache: matrix: include: - - os: linux-ppc64le + - os: linux + arch: ppc64le if: type == cron compiler: gcc - env: TARGET=linux-glibc OPENSSL_VERSION=1.0.2t LABEL="linux-ppc64le" + env: TARGET=linux-glibc OPENSSL_VERSION=1.0.2u - os: linux + arch: amd64 + if: type != cron + compiler: clang + env: TARGET=linux-glibc OPENSSL_VERSION=1.1.1d + - os: linux + arch: arm64 if: type != cron compiler: clang env: TARGET=linux-glibc OPENSSL_VERSION=1.1.1d @@ -93,7 +104,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" - - scripts/build-ssl.sh > build-ssl.log 2>&1 || (cat build-ssl.log && exit 1) + - travis_wait 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