From 8d2e9d66c6307d951eaf172415be2de4bbac6cfd Mon Sep 17 00:00:00 2001 From: Sitsofe Wheeler Date: Sun, 26 Jul 2020 02:43:16 +0100 Subject: [PATCH] travis: simplify yml file Signed-off-by: Sitsofe Wheeler --- .travis.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index b64f0a95..18267c04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,34 +9,26 @@ arch: - amd64 - arm64 env: - matrix: - - BUILD_ARCH="x86" - - BUILD_ARCH="x86_64" global: - MAKEFLAGS="-j 2" matrix: include: + - os: linux + compiler: gcc + arch: amd64 + env: BUILD_ARCH="x86" # Only do the gcc x86 build to reduce clutter # Default xcode image - os: osx compiler: clang # Workaround travis setting CC=["clang", "gcc"] - env: BUILD_ARCH="x86_64" arch: amd64 # Latest xcode image (needs periodic updating) - os: osx compiler: clang osx_image: xcode11.2 - env: BUILD_ARCH="x86_64" arch: amd64 exclude: - os: osx compiler: gcc - - os: linux - compiler: clang - arch: amd64 - env: BUILD_ARCH="x86" # Only do the gcc x86 build to reduce clutter - - os: linux - env: BUILD_ARCH="x86" - arch: arm64 before_install: - ci/travis-install.sh -- 2.25.1