]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: CI: introduce ARM64 builds
authorIlya Shipitsin <chipitsine@gmail.com>
Sun, 19 Jan 2020 07:14:02 +0000 (12:14 +0500)
committerWilly Tarreau <w@1wt.eu>
Wed, 22 Jan 2020 05:47:24 +0000 (06:47 +0100)
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

index e69f441667179ca4e937bac289f4d0ece5d85c5b..9046e6dcd26ff369de4bf1b3a6cef0a52827cfdc 100644 (file)
@@ -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