Merge branch 'develop' into feature/fetchcontent-declare

This commit is contained in:
Peter Dimov
2019-04-14 04:06:56 +03:00
2 changed files with 61 additions and 1 deletions

View File

@@ -1,4 +1,4 @@
# Copyright 2016-2018 Peter Dimov
# Copyright 2016-2019 Peter Dimov
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
@@ -12,6 +12,40 @@ branches:
- develop
- /feature\/.*/
env:
matrix:
- DEFAULT_JOB=true
matrix:
exclude:
- env: DEFAULT_JOB=true
include:
- os: linux
dist: trusty
compiler: g++
env: COMMENT=trusty-g++
- os: linux
dist: trusty
compiler: clang++
env: COMMENT=trusty-clang++
- os: linux
dist: xenial
compiler: g++
env: COMMENT=xenial-g++
- os: linux
dist: xenial
compiler: clang++
env: COMMENT=xenial-clang++
- os: osx
compiler: clang++
env: COMMENT=macos-clang++
script:
- mkdir __build__
- cd __build__

26
appveyor.yml Normal file
View File

@@ -0,0 +1,26 @@
# Copyright 2016-2019 Peter Dimov
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
version: 1.0.{build}-{branch}
shallow_clone: true
branches:
only:
- master
- develop
- /feature\/.*/
image:
- Visual Studio 2013
- Visual Studio 2015
- Visual Studio 2017
build: off
test_script:
- mkdir __build__
- cd __build__
- cmake ..
- cmake --build . --target check