feedc0de/boost_variant2
1
0
Fork 0
forked from boostorg/variant2
Code Pull Requests Activity

Update .yml files

Browse Source
This commit is contained in:
Peter Dimov
2018-10-18 00:05:41 +03:00
parent 81023c3569
commit 4fe9454e3e
2 changed files with 84 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
.travis.yml
View File

@@ -1,4 +1,4 @@
# Copyright 2016 Peter Dimov # Copyright 2016-2018 Peter Dimov
# Distributed under the Boost Software License, Version 1.0. # 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) # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
@@ -8,14 +8,11 @@ sudo: false
python: "2.7" python: "2.7"
os:
- linux
- osx
branches: branches:
only: only:
- master - master
- develop - develop
- /feature\/.*/
env: env:
matrix: matrix:
@@ -29,17 +26,7 @@ matrix:
include: include:
- os: linux - os: linux
compiler: g++-5 compiler: g++-5
env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=14,1z
addons:
apt:
packages:
- g++-5
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: g++-5
env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++1z
addons: addons:
apt: apt:
packages: packages:
@@ -49,7 +36,7 @@ matrix:
- os: linux - os: linux
compiler: g++-6 compiler: g++-6
env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=14,1z
addons: addons:
apt: apt:
packages: packages:
@@ -58,19 +45,8 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
compiler: g++-6
env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z
addons:
apt:
packages:
- g++-6
sources:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
compiler: g++-7 compiler: g++-7
env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=c++14 env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=14,17
addons: addons:
apt: apt:
packages: packages:
@@ -79,19 +55,28 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
dist: trusty compiler: g++-8
compiler: g++-7 env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=14,17
env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=c++1z
addons: addons:
apt: apt:
packages: packages:
- g++-7 - g++-8
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: g++-8
env: UBSAN=1 TOOLSET=gcc COMPILER=g++-8 CXXSTD=14,17 UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold
addons:
apt:
packages:
- g++-8
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
compiler: clang++-3.5 compiler: clang++-3.5
env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=c++14 env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=14,1z
addons: addons:
apt: apt:
packages: packages:
@@ -103,7 +88,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-3.6 compiler: clang++-3.6
env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++14 env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=14,1z
addons: addons:
apt: apt:
packages: packages:
@@ -114,7 +99,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-3.7 compiler: clang++-3.7
env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++14 env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=14,1z
addons: addons:
apt: apt:
packages: packages:
@@ -125,18 +110,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-3.8 compiler: clang++-3.8
env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++14 env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=14,1z
addons:
apt:
packages:
- clang-3.8
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
- os: linux
compiler: clang++-3.8
env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++1z
addons: addons:
apt: apt:
packages: packages:
@@ -147,7 +121,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-3.9 compiler: clang++-3.9
env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++14 env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=14,1z
addons: addons:
apt: apt:
packages: packages:
@@ -157,59 +131,78 @@ matrix:
- llvm-toolchain-precise-3.9 - llvm-toolchain-precise-3.9
- os: linux - os: linux
compiler: clang++-3.9
env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++1z
addons:
apt:
packages:
- clang-3.9
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.9
- os: linux
dist: trusty
compiler: clang++-4.0 compiler: clang++-4.0
env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=c++14 env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=14,1z
addons: addons:
apt: apt:
packages: packages:
- clang-4.0 - clang-4.0
- libstdc++-4.9-dev
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty-4.0 - llvm-toolchain-trusty-4.0
- os: linux - os: linux
dist: trusty compiler: clang++-5.0
compiler: clang++-4.0 env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=14,1z
env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=c++1z
addons: addons:
apt: apt:
packages: packages:
- clang-4.0 - clang-5.0
- libstdc++-4.9-dev
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty-4.0 - llvm-toolchain-trusty-5.0
- os: linux
compiler: clang++-6.0
env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=14,17
addons:
apt:
packages:
- clang-6.0
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-6.0
- os: linux
compiler: clang++-6.0
env: UBSAN=1 TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=14,1z UBSAN_OPTIONS=print_stacktrace=1
addons:
apt:
packages:
- clang-6.0
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-6.0
- os: linux
compiler: clang++-libc++
env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=11,14,1z
addons:
apt:
packages:
- libc++-dev
- os: linux
compiler: clang++-libc++
env: UBSAN=1 TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=14,1z UBSAN_OPTIONS=print_stacktrace=1
addons:
apt:
packages:
- libc++-dev
- os: osx - os: osx
compiler: clang++ compiler: clang++
env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 env: TOOLSET=clang COMPILER=clang++ CXXSTD=14,1z
- os: osx
compiler: clang++
env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++1z
install: install:
- BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
- cd .. - cd ..
- git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
- cd boost-root - cd boost-root
- git submodule update --init tools/build - git submodule update --init tools/build
- git submodule update --init libs/config - git submodule update --init libs/config
- git submodule update --init tools/boostdep - git submodule update --init tools/boostdep
- git clone -b $TRAVIS_BRANCH https://github.com/pdimov/mp11 libs/mp11 - mkdir -p libs/variant2
- mkdir libs/variant2
- cp -r $TRAVIS_BUILD_DIR/* libs/variant2 - cp -r $TRAVIS_BUILD_DIR/* libs/variant2
- python tools/boostdep/depinst/depinst.py variant2 - python tools/boostdep/depinst/depinst.py variant2
- ./bootstrap.sh - ./bootstrap.sh
@@ -217,8 +210,8 @@ install:
script: script:
- |- - |-
echo "using $TOOLSET : : $COMPILER : <cxxflags>-std=$CXXSTD ;" > ~/user-config.jam echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
- ./b2 libs/variant2/test toolset=$TOOLSET - ./b2 libs/variant2/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined define=UBSAN=1 debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
notifications: notifications:
email: email:

19
appveyor.yml
View File

@@ -1,4 +1,4 @@
# Copyright 2016, 2017 Peter Dimov # Copyright 2016-2018 Peter Dimov
# Distributed under the Boost Software License, Version 1.0. # 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) # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
@@ -10,27 +10,32 @@ branches:
only: only:
- master - master
- develop - develop
- /feature\/.*/
environment: environment:
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
TOOLSET: msvc-14.1 TOOLSET: msvc-14.1
ADDRMD: 32,64
CXXSTD: 14,17
install: install:
- set BOOST_BRANCH=develop
- if "%APPVEYOR_REPO_BRANCH%" == "master" set BOOST_BRANCH=master
- cd .. - cd ..
- git clone -b %APPVEYOR_REPO_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
- cd boost-root - cd boost-root
- git submodule update --init tools/build - git submodule update --init tools/build
- git submodule update --init libs/config - git submodule update --init libs/config
- git submodule update --init tools/boostdep - git submodule update --init tools/boostdep
- git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/pdimov/mp11 libs/mp11 - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\variant2\
- mkdir libs\variant2
- xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\variant2
- python tools/boostdep/depinst/depinst.py variant2 - python tools/boostdep/depinst/depinst.py variant2
- cmd /c bootstrap - cmd /c bootstrap
- b2 headers - b2 -d0 headers
build: off build: off
test_script: test_script:
- b2 libs/variant2/test toolset=%TOOLSET% - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
- if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
- b2 libs/variant2/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% variant=debug,release