From af9bc631cc84bca80b96508ca479cea38ed5977c Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Sun, 9 Feb 2020 13:09:30 -0800 Subject: [PATCH] Bump Docker version, update clang10+gcc9, CMake 3.16, adds SDL2, LLD The vulkan library and SDL2 libraries are now self-built, due to distro packages being too low version --- .travis.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 253ff1d3ec..2d8703f86e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: cpp -matrix: +jobs: include: # - os: linux # env: @@ -17,15 +17,10 @@ matrix: - DEPLOY_APPIMAGE="true" services: docker cache: ccache - install: "docker pull rpcs3/rpcs3-travis-xenial:1.0" - addons: - apt: - packages: - - libsdl2-2.0 - - libsdl2-dev - 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' + 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: xcode10.2 + osx_image: xcode11.3 addons: homebrew: packages: