From daab7b2be74cda5e144a9dc3d10989d3522d2964 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 31 Jul 2020 19:50:23 +0200 Subject: travis: add ppc64le and s390x builds Closes #5752 --- .travis.yml | 38 +++++++++++++++++++++++++++++++++++++- scripts/travis/before_script.sh | 28 +++++++++++++++------------- 2 files changed, 52 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0150d69a1..dd9ab3dc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -155,7 +155,7 @@ jobs: - libbrotli-dev - libzstd-dev - env: - - T=debug-mesalink C="--with-mesalink --without-ssl" + - T=debug-mesalink C="--with-mesalink --without-ssl" MESALINK=yes - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" addons: apt: @@ -349,6 +349,42 @@ jobs: - pkg-config - zlib1g-dev + - env: + - T=debug C="--enable-alt-svc" + - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" + arch: ppc64le + addons: + apt: + <<: *common_apt + packages: + - *common_packages + - libpsl-dev + - libbrotli-dev + - libzstd-dev + - libev-dev + - libssl-dev + - libtool + - pkg-config + - zlib1g-dev + + - env: + - T=debug C="--enable-alt-svc" + - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" + arch: s390x + addons: + apt: + <<: *common_apt + packages: + - *common_packages + - libpsl-dev + - libbrotli-dev + - libzstd-dev + - libev-dev + - libssl-dev + - libtool + - pkg-config + - zlib1g-dev + before_install: - export "${OVERRIDE_CC-blank=}" - export "${OVERRIDE_CXX-blank=}" diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh index bcc8cd4e1..1938f9e48 100755 --- a/scripts/travis/before_script.sh +++ b/scripts/travis/before_script.sh @@ -119,20 +119,22 @@ if [ $TRAVIS_OS_NAME = linux ]; then cd $HOME/wolfssl-4.4.0-stable sudo make install - if [ ! -e $HOME/mesalink-1.0.0/Makefile ]; then - cd $HOME - curl https://sh.rustup.rs -sSf | sh -s -- -y - source $HOME/.cargo/env - curl -LO https://github.com/mesalock-linux/mesalink/archive/v1.0.0.tar.gz - tar -xzf v1.0.0.tar.gz - cd mesalink-1.0.0 - ./autogen.sh - ./configure --enable-tls13 - make - fi + if [ "$MESALINK" = "yes" ]; then + if [ ! -e $HOME/mesalink-1.0.0/Makefile ]; then + cd $HOME + curl https://sh.rustup.rs -sSf | sh -s -- -y + source $HOME/.cargo/env + curl -LO https://github.com/mesalock-linux/mesalink/archive/v1.0.0.tar.gz + tar -xzf v1.0.0.tar.gz + cd mesalink-1.0.0 + ./autogen.sh + ./configure --enable-tls13 + make + fi + cd $HOME/mesalink-1.0.0 + sudo make install - cd $HOME/mesalink-1.0.0 - sudo make install + fi if [ ! -e $HOME/nghttp2-1.39.2/Makefile ]; then cd $HOME -- cgit v1.2.1