mirror of https://github.com/PCSX2/pcsx2.git
ci: Update Travis CI and AppVeyor configurations
Travis CI: Replace GCC4.9 64-bit with GCC7 64-bit. Replace GCC5 32-bit with GCC7 32-bit. Move 64-bit to top of matrix so it gets built first (ccache doesn't work on the 64-bit build and I don't know why (it works locally), so it takes the longest to build). AppVeyor: Add VS2017 build job.
This commit is contained in:
parent
7a7844162d
commit
1bcb7eccbc
11
.travis.yml
11
.travis.yml
|
@ -1,16 +1,18 @@
|
||||||
language: cpp
|
language: cpp
|
||||||
|
|
||||||
sudo: required
|
sudo: required
|
||||||
dist: trusty
|
|
||||||
|
|
||||||
cache: ccache
|
cache: ccache
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- env: VERSION=6 BITS=32
|
- env: VERSION=7 BITS=64
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
os: linux
|
os: linux
|
||||||
- env: VERSION=5 BITS=32
|
- env: VERSION=7 BITS=32
|
||||||
|
compiler: gcc
|
||||||
|
os: linux
|
||||||
|
- env: VERSION=6 BITS=32
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
os: linux
|
os: linux
|
||||||
- env: VERSION=4.9 BITS=32
|
- env: VERSION=4.9 BITS=32
|
||||||
|
@ -19,9 +21,6 @@ matrix:
|
||||||
- env: VERSION=3.8 BITS=32
|
- env: VERSION=3.8 BITS=32
|
||||||
compiler: clang
|
compiler: clang
|
||||||
os: linux
|
os: linux
|
||||||
- env: VERSION=4.9 BITS=64
|
|
||||||
compiler: gcc
|
|
||||||
os: linux
|
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- ./travis.sh before_install
|
- ./travis.sh before_install
|
||||||
|
|
|
@ -3,11 +3,18 @@
|
||||||
# finished, which could be a bit annoying.
|
# finished, which could be a bit annoying.
|
||||||
version: 1.{build}-{branch}
|
version: 1.{build}-{branch}
|
||||||
|
|
||||||
|
image: Visual Studio 2017
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
matrix:
|
matrix:
|
||||||
|
- platform: Win32
|
||||||
|
target: AppVeyor
|
||||||
|
visualstudio_string: vs2017
|
||||||
|
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||||
- platform: Win32
|
- platform: Win32
|
||||||
target: AppVeyor
|
target: AppVeyor
|
||||||
visualstudio_string: vs2015
|
visualstudio_string: vs2015
|
||||||
|
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
|
|
Loading…
Reference in New Issue