From 57a984427966458ee5537acf55cc8028cae6214c Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Tue, 18 Feb 2020 21:52:33 -0800 Subject: [PATCH] Re-eanble gcc matrix in Travis CI, thanks to Neko for the hint --- .travis.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2d8703f86e..1acb99871b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,16 @@ language: cpp jobs: include: -# - os: linux -# env: -# - NAME="Linux build" -# - COMPILER="gcc" -# services: docker -# cache: ccache -# install: "docker pull rpcs3/rpcs3-travis-xenial:1.0" -# script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-xenial:1.0 /bin/bash -ex /rpcs3/.travis/build-linux.bash' + - os: linux + dist: xenial + env: + - NAME="Linux build" + - COMPILER="gcc" + services: docker + cache: ccache + compiler: gcc + install: "docker pull rpcs3/rpcs3-travis-xenial:1.2" + script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-xenial:1.2 /bin/bash -ex /rpcs3/.travis/build-linux.bash' - os: linux dist: xenial env: @@ -17,7 +19,8 @@ jobs: - DEPLOY_APPIMAGE="true" services: docker cache: ccache - install: "docker pull rpcs3/rpcs3-travis-xenial:1.2" + compiler: clang + install: "docker pull rpcs3/rpcs3-travis-xenial:1.2" script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-xenial:1.2 /bin/bash -ex /rpcs3/.travis/build-linux.bash' - os: osx osx_image: xcode11.3