ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-eanble gcc matrix in Travis CI, thanks to Neko for the hint

This commit is contained in:
Zion Nimchuk 2020-02-18 21:52:33 -08:00 committed by Ivan
parent f02b4801b2
commit 57a9844279
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.travis.yml
View File

@ -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