From 80fa364fd7cd2620ea7bd7f96be598c41505a299 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 20 Sep 2020 19:02:00 +0100 Subject: IBM Z (#4892) --- .travis.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index f57727eca..a78ec5656 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,12 @@ cache: os: linux dist: bionic -# TODO: add IBM builds when we find CMake for them -# add PowerPC builds when sqlite3 crashing is fixed +# Install newer SeeMake on Linux +addons: + snaps: + - name: cmake + confinement: classic + channel: latest jobs: include: @@ -18,10 +22,8 @@ jobs: - name: "Clang 6.0 - Debug" arch: arm64 compiler: clang - before_install: - - wget --output-document=${HOME}/CMake http://anaconda.org/conda-forge/cmake/3.17.0/download/linux-aarch64/cmake-3.17.0-h28c56e5_0.tar.bz2 - - tar --extract --one-top-level=${HOME}/SeeMake --file ${HOME}/CMake - - export PATH=${HOME}/SeeMake/bin/:${PATH} + before_install: &use-cmake + - export PATH=/snap/bin/:${PATH} env: *Debug - name: "AppleClang - Debug" @@ -34,10 +36,7 @@ jobs: - name: "Clang 7.0 - Release" compiler: clang - before_install: &use-cmake - - wget --output-document=${HOME}/CMake http://cmake.org/files/v3.17/cmake-3.17.2-Linux-x86_64.tar.gz - - tar --extract --one-top-level=${HOME}/SeeMake --strip-components 1 --file ${HOME}/CMake - - export PATH=${HOME}/SeeMake/bin/:${PATH} + before_install: *use-cmake env: *Release - name: "Clang 7.0 - Debug" @@ -45,7 +44,7 @@ jobs: before_install: *use-cmake env: *Debug - - name: "GCC 7.4 - Release, CMake 3.12, No Unity" + - name: "GCC 7.5 - Release, CMake 3.13, No Unity" compiler: gcc before_install: - wget --output-document=${HOME}/CMake http://cmake.org/files/v3.13/cmake-3.13.0-Linux-x86_64.tar.gz @@ -55,7 +54,7 @@ jobs: - TRAVIS_CUBERITE_BUILD_TYPE=Release - TRAVIS_CUBERITE_UNITY_BUILDS=No - - name: "GCC 7.4 - Debug" + - name: "GCC 7.5 - Debug" compiler: gcc before_install: *use-cmake env: *Debug -- cgit v1.2.3