Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #30 from boostorg/develop
Merge 'develop' to 'master'
- Loading branch information
Showing
84 changed files
with
2,230 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,272 @@ | ||
# Copyright 2018 Cromwell D. Enage | ||
# 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) | ||
|
||
language: cpp | ||
|
||
python: "2.7" | ||
|
||
branches: | ||
only: | ||
- master | ||
- develop | ||
- /feature\/.*/ | ||
|
||
env: | ||
matrix: | ||
- BOGUS_JOB=true | ||
|
||
matrix: | ||
|
||
exclude: | ||
- env: BOGUS_JOB=true | ||
|
||
include: | ||
- os: linux | ||
compiler: g++-4.4 | ||
env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x | ||
addons: | ||
apt: | ||
packages: | ||
- g++-4.4 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
|
||
- os: linux | ||
compiler: g++-4.6 | ||
env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x | ||
addons: | ||
apt: | ||
packages: | ||
- g++-4.6 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
|
||
- os: linux | ||
env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11 | ||
addons: | ||
apt: | ||
packages: | ||
- g++-4.7 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
|
||
- os: linux | ||
env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11 | ||
addons: | ||
apt: | ||
packages: | ||
- g++-4.8 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
|
||
- os: linux | ||
env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11 | ||
addons: | ||
apt: | ||
packages: | ||
- g++-4.9 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
|
||
- os: linux | ||
env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=03,11,14 | ||
addons: | ||
apt: | ||
packages: | ||
- g++-5 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
|
||
- os: linux | ||
env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03,11,14,1z | ||
addons: | ||
apt: | ||
packages: | ||
- g++-6 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
|
||
- os: linux | ||
env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03,11,14,1z CXXSTD_DIALECT=cxxstd-dialect=gnu | ||
addons: | ||
apt: | ||
packages: | ||
- g++-6 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
|
||
- os: linux | ||
dist: trusty | ||
compiler: g++-7 | ||
env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17 | ||
addons: | ||
apt: | ||
packages: | ||
- g++-7 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
|
||
- os: linux | ||
dist: trusty | ||
compiler: g++-7 | ||
env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17 CXXSTD_DIALECT=cxxstd-dialect=gnu | ||
addons: | ||
apt: | ||
packages: | ||
- g++-7 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
|
||
- os: linux | ||
compiler: g++-8 | ||
env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17 | ||
addons: | ||
apt: | ||
packages: | ||
- g++-8 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
|
||
- os: linux | ||
env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11 | ||
addons: | ||
apt: | ||
packages: | ||
- clang-3.5 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
- llvm-toolchain-precise-3.5 | ||
|
||
- os: linux | ||
env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11 | ||
addons: | ||
apt: | ||
packages: | ||
- clang-3.6 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
- llvm-toolchain-precise-3.6 | ||
|
||
- os: linux | ||
env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11 | ||
addons: | ||
apt: | ||
packages: | ||
- clang-3.7 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
- llvm-toolchain-precise-3.7 | ||
|
||
- os: linux | ||
env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z | ||
addons: | ||
apt: | ||
packages: | ||
- clang-3.8 | ||
- libstdc++-4.9-dev | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
- llvm-toolchain-precise-3.8 | ||
|
||
- os: linux | ||
env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z | ||
addons: | ||
apt: | ||
packages: | ||
- clang-3.9 | ||
- libstdc++-4.9-dev | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
- llvm-toolchain-precise-3.9 | ||
|
||
- os: linux | ||
compiler: clang++-4.0 | ||
env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03,11,14,1z | ||
addons: | ||
apt: | ||
packages: | ||
- clang-4.0 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
- llvm-toolchain-trusty-4.0 | ||
|
||
- os: linux | ||
compiler: clang++-5.0 | ||
env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=03,11,14,1z | ||
addons: | ||
apt: | ||
packages: | ||
- clang-5.0 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
- llvm-toolchain-trusty-5.0 | ||
|
||
- os: linux | ||
compiler: clang++-6.0 | ||
env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,1z | ||
addons: | ||
apt: | ||
packages: | ||
- clang-6.0 | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
- llvm-toolchain-trusty-6.0 | ||
|
||
- os: linux | ||
compiler: clang++ | ||
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z | ||
addons: | ||
apt: | ||
packages: | ||
- libstdc++-5-dev | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
|
||
- os: linux | ||
compiler: clang++-libc++ | ||
env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z | ||
addons: | ||
apt: | ||
packages: | ||
- libc++-dev | ||
|
||
- os: osx | ||
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z | ||
osx_image: xcode7.3 | ||
|
||
- os: osx | ||
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z | ||
osx_image: xcode8.3 | ||
|
||
- os: osx | ||
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z | ||
osx_image: xcode9.4.1 | ||
|
||
install: | ||
- BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true | ||
- cd .. | ||
- git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root | ||
- cd boost-root | ||
- git submodule update --init tools/boost_install | ||
- git submodule update --init libs/headers | ||
- git submodule update --init tools/build | ||
- git submodule update --init libs/config | ||
- git submodule update --init tools/boostdep | ||
- cp -r $TRAVIS_BUILD_DIR/* libs/accumulators | ||
- python tools/boostdep/depinst/depinst.py accumulators | ||
- ./bootstrap.sh | ||
- ./b2 headers | ||
|
||
script: | ||
- |- | ||
echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam | ||
- ./b2 --verbose-test libs/config/test//config_info toolset=$TOOLSET cxxstd=$CXXSTD || true | ||
- cd libs/accumulators/test | ||
- ../../../b2 -j`(nproc || sysctl -n hw.ncpu) 2> /dev/null` toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT | ||
- cd ../../.. | ||
|
||
notifications: | ||
email: | ||
on_success: always |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
# Copyright 2018 Cromwell D. Enage | ||
# 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 | ||
|
||
environment: | ||
matrix: | ||
- ARGS: --toolset=gcc address-model=32 | ||
PATH: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;%PATH% | ||
- ARGS: --toolset=gcc address-model=32 linkflags=-Wl,-allow-multiple-definition | ||
PATH: C:\MinGW\bin;%PATH% | ||
- ARGS: --toolset=gcc address-model=64 | ||
PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH% | ||
- ARGS: --toolset=gcc address-model=64 cxxflags=-std=gnu++1z | ||
PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH% | ||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 | ||
ARGS: --toolset=msvc-9.0 address-model=32 | ||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 | ||
ARGS: --toolset=msvc-10.0 address-model=32 | ||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 | ||
ARGS: --toolset=msvc-11.0 address-model=32 | ||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 | ||
ARGS: --toolset=msvc-12.0 address-model=32 | ||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 | ||
ARGS: --toolset=msvc-12.0 address-model=64 | ||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 | ||
ARGS: --toolset=msvc-14.0 address-model=32 | ||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 | ||
ARGS: --toolset=msvc-14.0 address-model=64 | ||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 | ||
ARGS: --toolset=msvc-14.0 address-model=64 cxxflags=-std:c++latest | ||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 | ||
ARGS: --toolset=msvc-14.1 address-model=32 | ||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 | ||
ARGS: --toolset=msvc-14.1 address-model=64 | ||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 | ||
ARGS: --toolset=msvc-14.1 address-model=64 cxxflags=-std:c++latest | ||
|
||
install: | ||
- cd .. | ||
- git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost-root | ||
- cd boost-root | ||
- git submodule update --init tools/boost_install | ||
- git submodule update --init libs/headers | ||
- git submodule update --init tools/build | ||
- git submodule update --init libs/config | ||
- git submodule update --init tools/boostdep | ||
- xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\accumulators | ||
- python tools/boostdep/depinst/depinst.py accumulators | ||
- bootstrap | ||
- b2 headers | ||
|
||
build: off | ||
|
||
test_script: | ||
- cd libs\accumulators\test | ||
- ..\..\..\b2 -j%NUMBER_OF_PROCESSORS% --hash %ARGS% | ||
- cd ..\..\.. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.