update ci
This commit is contained in:
parent
7f4fc39a0a
commit
a8dac47ada
2 changed files with 30 additions and 5 deletions
|
@ -2,6 +2,7 @@ version: "{branch} #{build}"
|
|||
|
||||
image:
|
||||
- Visual Studio 2017
|
||||
- Visual Studio 2019
|
||||
|
||||
platform:
|
||||
- Win32
|
||||
|
@ -14,15 +15,11 @@ configuration:
|
|||
build:
|
||||
parallel: true
|
||||
|
||||
environment:
|
||||
matrix:
|
||||
- GENERATOR: "Visual Studio 15 2017"
|
||||
|
||||
before_build:
|
||||
- if exist build RMDIR /S /Q build
|
||||
- if not exist build mkdir build
|
||||
- cd build
|
||||
- cmake -G "%GENERATOR%" -A %PLATFORM% ..
|
||||
- cmake -A %PLATFORM% ..
|
||||
|
||||
build_script:
|
||||
- cmake --build . --config %CONFIGURATION%
|
||||
|
|
28
.travis.yml
28
.travis.yml
|
@ -6,6 +6,28 @@ language: cpp
|
|||
|
||||
matrix:
|
||||
include:
|
||||
- os: linux
|
||||
compiler: g++
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- g++-7
|
||||
env:
|
||||
- CXX_COMPILER=g++-7 CC_COMPILER=gcc-7
|
||||
|
||||
- os: linux
|
||||
compiler: g++
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- g++-8
|
||||
env:
|
||||
- CXX_COMPILER=g++-8 CC_COMPILER=gcc-8
|
||||
|
||||
- os: linux
|
||||
compiler: g++
|
||||
addons:
|
||||
|
@ -69,6 +91,12 @@ matrix:
|
|||
env:
|
||||
- CXX_COMPILER=clang++-8 CC_COMPILER=clang-8
|
||||
|
||||
- os: osx
|
||||
compiler: clang++
|
||||
osx_image: xcode9.4
|
||||
env:
|
||||
- CXX_COMPILER=clang++ CC_COMPILER=clang
|
||||
|
||||
- os: osx
|
||||
compiler: clang++
|
||||
osx_image: xcode10.3
|
||||
|
|
Loading…
Reference in a new issue