archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 22:41:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

21
.travis.yml
View file

@ -1,14 +1,16 @@
language: cpp language: cpp
jobs: jobs:
include: include:
# - os: linux - os: linux
# env: dist: xenial
# - NAME="Linux build" env:
# - COMPILER="gcc" - NAME="Linux build"
# services: docker - COMPILER="gcc"
# cache: ccache services: docker
# install: "docker pull rpcs3/rpcs3-travis-xenial:1.0" cache: ccache
# 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' 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 - os: linux
dist: xenial dist: xenial
env: env:
@ -17,7 +19,8 @@ jobs:
- DEPLOY_APPIMAGE="true" - DEPLOY_APPIMAGE="true"
services: docker services: docker
cache: ccache 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' 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 - os: osx
osx_image: xcode11.3 osx_image: xcode11.3