From a506733d998a0e2b10196e412b77e2407ed7cb53 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Thu, 10 Aug 2017 12:04:14 +0100 Subject: [PATCH 1/6] Add appveyor.yml CI script. --- appveyor.yml | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..84e5db6 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,62 @@ +# Copyright 2016 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 + +platform: + - x64 + +environment: + matrix: + - ARGS: --toolset=msvc-9.0 address-model=32 + - ARGS: --toolset=msvc-10.0 address-model=32 + - ARGS: --toolset=msvc-11.0 address-model=32 + - ARGS: --toolset=msvc-12.0 address-model=32 + - ARGS: --toolset=msvc-14.0 address-model=32 + - ARGS: --toolset=msvc-12.0 address-model=64 + - ARGS: --toolset=msvc-14.0 address-model=64 + - 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=64 + - 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 cxxflags=-std:c++latest + - 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% + - 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% + + +install: + - cd .. + - git clone -b %APPVEYOR_REPO_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root + - cd boost-root + - git submodule update --init tools/build + - git submodule update --init libs/config + - git submodule update --init tools/boostdep + - xcopy /s /e /q $TRAVIS_BUILD_DIR/* libs/typeof + - python tools/boostdep/depinst/depinst.py typeof + - bootstrap + - b2 headers + +build: off + +test_script: + - cd libs\config\test + - ..\..\..\b2 config_info_travis_install %ARGS% + - config_info_travis + - cd ..\..\typeof\test + - ..\..\..\b2 -j3 %ARGS% define=CI_SUPPRESS_KNOWN_ISSUES From 8475a449d3124c74c6847cfafc401d009084a970 Mon Sep 17 00:00:00 2001 From: Michael Caisse Date: Thu, 10 Aug 2017 09:19:30 -0700 Subject: [PATCH 2/6] Appveyor config referenced Travis variables --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 84e5db6..61f7844 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -47,7 +47,7 @@ install: - git submodule update --init tools/build - git submodule update --init libs/config - git submodule update --init tools/boostdep - - xcopy /s /e /q $TRAVIS_BUILD_DIR/* libs/typeof + - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\typeof\ - python tools/boostdep/depinst/depinst.py typeof - bootstrap - b2 headers From 05ad6402ef3bb729255b909763c78547725be256 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Sun, 17 Sep 2017 08:27:46 -0400 Subject: [PATCH 3/6] Remove executable attribute. --- include/boost/typeof/dmc/typeof_impl.hpp | 0 include/boost/typeof/encode_decode.hpp | 0 include/boost/typeof/encode_decode_params.hpp | 0 include/boost/typeof/incr_registration_group.hpp | 0 include/boost/typeof/int_encoding.hpp | 0 include/boost/typeof/integral_template_param.hpp | 0 include/boost/typeof/modifiers.hpp | 0 include/boost/typeof/pointers_data_members.hpp | 0 include/boost/typeof/register_mem_functions.hpp | 0 include/boost/typeof/std/bitset.hpp | 0 include/boost/typeof/std/complex.hpp | 0 include/boost/typeof/std/deque.hpp | 0 include/boost/typeof/std/fstream.hpp | 0 include/boost/typeof/std/functional.hpp | 0 include/boost/typeof/std/iostream.hpp | 0 include/boost/typeof/std/istream.hpp | 0 include/boost/typeof/std/iterator.hpp | 0 include/boost/typeof/std/list.hpp | 0 include/boost/typeof/std/locale.hpp | 0 include/boost/typeof/std/map.hpp | 0 include/boost/typeof/std/memory.hpp | 0 include/boost/typeof/std/ostream.hpp | 0 include/boost/typeof/std/queue.hpp | 0 include/boost/typeof/std/set.hpp | 0 include/boost/typeof/std/sstream.hpp | 0 include/boost/typeof/std/stack.hpp | 0 include/boost/typeof/std/streambuf.hpp | 0 include/boost/typeof/std/string.hpp | 0 include/boost/typeof/std/utility.hpp | 0 include/boost/typeof/std/valarray.hpp | 0 include/boost/typeof/std/vector.hpp | 0 include/boost/typeof/template_encoding.hpp | 0 include/boost/typeof/template_template_param.hpp | 0 include/boost/typeof/type_encoding.hpp | 0 include/boost/typeof/type_template_param.hpp | 0 include/boost/typeof/typeof_impl.hpp | 0 include/boost/typeof/vector.hpp | 0 include/boost/typeof/vector100.hpp | 0 include/boost/typeof/vector150.hpp | 0 include/boost/typeof/vector200.hpp | 0 include/boost/typeof/vector50.hpp | 0 test/data_member.cpp | 0 test/member_function.cpp | 0 test/modifiers.cpp | 0 test/noncopyable.cpp | 0 test/odr.hpp | 0 test/odr1.cpp | 0 test/odr2.cpp | 0 test/odr_no_uns1.cpp | 0 test/odr_no_uns1.hpp | 0 test/odr_no_uns2.cpp | 0 test/odr_no_uns2.hpp | 0 test/std.cpp | 0 test/template_dependent.cpp | 0 test/template_enum.cpp | 0 test/template_int.cpp | 0 test/template_multiword.cpp | 0 test/template_tpl.cpp | 0 test/template_type.cpp | 0 test/test.hpp | 0 test/type.cpp | 0 61 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 include/boost/typeof/dmc/typeof_impl.hpp mode change 100755 => 100644 include/boost/typeof/encode_decode.hpp mode change 100755 => 100644 include/boost/typeof/encode_decode_params.hpp mode change 100755 => 100644 include/boost/typeof/incr_registration_group.hpp mode change 100755 => 100644 include/boost/typeof/int_encoding.hpp mode change 100755 => 100644 include/boost/typeof/integral_template_param.hpp mode change 100755 => 100644 include/boost/typeof/modifiers.hpp mode change 100755 => 100644 include/boost/typeof/pointers_data_members.hpp mode change 100755 => 100644 include/boost/typeof/register_mem_functions.hpp mode change 100755 => 100644 include/boost/typeof/std/bitset.hpp mode change 100755 => 100644 include/boost/typeof/std/complex.hpp mode change 100755 => 100644 include/boost/typeof/std/deque.hpp mode change 100755 => 100644 include/boost/typeof/std/fstream.hpp mode change 100755 => 100644 include/boost/typeof/std/functional.hpp mode change 100755 => 100644 include/boost/typeof/std/iostream.hpp mode change 100755 => 100644 include/boost/typeof/std/istream.hpp mode change 100755 => 100644 include/boost/typeof/std/iterator.hpp mode change 100755 => 100644 include/boost/typeof/std/list.hpp mode change 100755 => 100644 include/boost/typeof/std/locale.hpp mode change 100755 => 100644 include/boost/typeof/std/map.hpp mode change 100755 => 100644 include/boost/typeof/std/memory.hpp mode change 100755 => 100644 include/boost/typeof/std/ostream.hpp mode change 100755 => 100644 include/boost/typeof/std/queue.hpp mode change 100755 => 100644 include/boost/typeof/std/set.hpp mode change 100755 => 100644 include/boost/typeof/std/sstream.hpp mode change 100755 => 100644 include/boost/typeof/std/stack.hpp mode change 100755 => 100644 include/boost/typeof/std/streambuf.hpp mode change 100755 => 100644 include/boost/typeof/std/string.hpp mode change 100755 => 100644 include/boost/typeof/std/utility.hpp mode change 100755 => 100644 include/boost/typeof/std/valarray.hpp mode change 100755 => 100644 include/boost/typeof/std/vector.hpp mode change 100755 => 100644 include/boost/typeof/template_encoding.hpp mode change 100755 => 100644 include/boost/typeof/template_template_param.hpp mode change 100755 => 100644 include/boost/typeof/type_encoding.hpp mode change 100755 => 100644 include/boost/typeof/type_template_param.hpp mode change 100755 => 100644 include/boost/typeof/typeof_impl.hpp mode change 100755 => 100644 include/boost/typeof/vector.hpp mode change 100755 => 100644 include/boost/typeof/vector100.hpp mode change 100755 => 100644 include/boost/typeof/vector150.hpp mode change 100755 => 100644 include/boost/typeof/vector200.hpp mode change 100755 => 100644 include/boost/typeof/vector50.hpp mode change 100755 => 100644 test/data_member.cpp mode change 100755 => 100644 test/member_function.cpp mode change 100755 => 100644 test/modifiers.cpp mode change 100755 => 100644 test/noncopyable.cpp mode change 100755 => 100644 test/odr.hpp mode change 100755 => 100644 test/odr1.cpp mode change 100755 => 100644 test/odr2.cpp mode change 100755 => 100644 test/odr_no_uns1.cpp mode change 100755 => 100644 test/odr_no_uns1.hpp mode change 100755 => 100644 test/odr_no_uns2.cpp mode change 100755 => 100644 test/odr_no_uns2.hpp mode change 100755 => 100644 test/std.cpp mode change 100755 => 100644 test/template_dependent.cpp mode change 100755 => 100644 test/template_enum.cpp mode change 100755 => 100644 test/template_int.cpp mode change 100755 => 100644 test/template_multiword.cpp mode change 100755 => 100644 test/template_tpl.cpp mode change 100755 => 100644 test/template_type.cpp mode change 100755 => 100644 test/test.hpp mode change 100755 => 100644 test/type.cpp diff --git a/include/boost/typeof/dmc/typeof_impl.hpp b/include/boost/typeof/dmc/typeof_impl.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/encode_decode.hpp b/include/boost/typeof/encode_decode.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/encode_decode_params.hpp b/include/boost/typeof/encode_decode_params.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/incr_registration_group.hpp b/include/boost/typeof/incr_registration_group.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/int_encoding.hpp b/include/boost/typeof/int_encoding.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/integral_template_param.hpp b/include/boost/typeof/integral_template_param.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/modifiers.hpp b/include/boost/typeof/modifiers.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/pointers_data_members.hpp b/include/boost/typeof/pointers_data_members.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/register_mem_functions.hpp b/include/boost/typeof/register_mem_functions.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/bitset.hpp b/include/boost/typeof/std/bitset.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/complex.hpp b/include/boost/typeof/std/complex.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/deque.hpp b/include/boost/typeof/std/deque.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/fstream.hpp b/include/boost/typeof/std/fstream.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/functional.hpp b/include/boost/typeof/std/functional.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/iostream.hpp b/include/boost/typeof/std/iostream.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/istream.hpp b/include/boost/typeof/std/istream.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/iterator.hpp b/include/boost/typeof/std/iterator.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/list.hpp b/include/boost/typeof/std/list.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/locale.hpp b/include/boost/typeof/std/locale.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/map.hpp b/include/boost/typeof/std/map.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/memory.hpp b/include/boost/typeof/std/memory.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/ostream.hpp b/include/boost/typeof/std/ostream.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/queue.hpp b/include/boost/typeof/std/queue.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/set.hpp b/include/boost/typeof/std/set.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/sstream.hpp b/include/boost/typeof/std/sstream.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/stack.hpp b/include/boost/typeof/std/stack.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/streambuf.hpp b/include/boost/typeof/std/streambuf.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/string.hpp b/include/boost/typeof/std/string.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/utility.hpp b/include/boost/typeof/std/utility.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/valarray.hpp b/include/boost/typeof/std/valarray.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/std/vector.hpp b/include/boost/typeof/std/vector.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/template_encoding.hpp b/include/boost/typeof/template_encoding.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/template_template_param.hpp b/include/boost/typeof/template_template_param.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/type_encoding.hpp b/include/boost/typeof/type_encoding.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/type_template_param.hpp b/include/boost/typeof/type_template_param.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/typeof_impl.hpp b/include/boost/typeof/typeof_impl.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/vector.hpp b/include/boost/typeof/vector.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/vector100.hpp b/include/boost/typeof/vector100.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/vector150.hpp b/include/boost/typeof/vector150.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/vector200.hpp b/include/boost/typeof/vector200.hpp old mode 100755 new mode 100644 diff --git a/include/boost/typeof/vector50.hpp b/include/boost/typeof/vector50.hpp old mode 100755 new mode 100644 diff --git a/test/data_member.cpp b/test/data_member.cpp old mode 100755 new mode 100644 diff --git a/test/member_function.cpp b/test/member_function.cpp old mode 100755 new mode 100644 diff --git a/test/modifiers.cpp b/test/modifiers.cpp old mode 100755 new mode 100644 diff --git a/test/noncopyable.cpp b/test/noncopyable.cpp old mode 100755 new mode 100644 diff --git a/test/odr.hpp b/test/odr.hpp old mode 100755 new mode 100644 diff --git a/test/odr1.cpp b/test/odr1.cpp old mode 100755 new mode 100644 diff --git a/test/odr2.cpp b/test/odr2.cpp old mode 100755 new mode 100644 diff --git a/test/odr_no_uns1.cpp b/test/odr_no_uns1.cpp old mode 100755 new mode 100644 diff --git a/test/odr_no_uns1.hpp b/test/odr_no_uns1.hpp old mode 100755 new mode 100644 diff --git a/test/odr_no_uns2.cpp b/test/odr_no_uns2.cpp old mode 100755 new mode 100644 diff --git a/test/odr_no_uns2.hpp b/test/odr_no_uns2.hpp old mode 100755 new mode 100644 diff --git a/test/std.cpp b/test/std.cpp old mode 100755 new mode 100644 diff --git a/test/template_dependent.cpp b/test/template_dependent.cpp old mode 100755 new mode 100644 diff --git a/test/template_enum.cpp b/test/template_enum.cpp old mode 100755 new mode 100644 diff --git a/test/template_int.cpp b/test/template_int.cpp old mode 100755 new mode 100644 diff --git a/test/template_multiword.cpp b/test/template_multiword.cpp old mode 100755 new mode 100644 diff --git a/test/template_tpl.cpp b/test/template_tpl.cpp old mode 100755 new mode 100644 diff --git a/test/template_type.cpp b/test/template_type.cpp old mode 100755 new mode 100644 diff --git a/test/test.hpp b/test/test.hpp old mode 100755 new mode 100644 diff --git a/test/type.cpp b/test/type.cpp old mode 100755 new mode 100644 From a9298ee94f5a8fb3e0301f12677b3a98aba503e2 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 4 Nov 2017 00:36:29 +0200 Subject: [PATCH 4/6] Add `import testing ;` to test/Jamfile --- test/Jamfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 28d7beb..d0fc589 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -5,6 +5,7 @@ # Boost Typeof Library test Jamfile +import testing ; import set ; # The special requirement is not ported yet. From ec502afe5d584801b63b1814963012d9552efada Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 4 Nov 2017 00:36:52 +0200 Subject: [PATCH 5/6] Update .travis.yml --- .travis.yml | 220 +++++++++++----------------------------------------- 1 file changed, 46 insertions(+), 174 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb1a81c..80394a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,14 +8,11 @@ sudo: false python: "2.7" -os: - - linux - - osx - branches: only: - master - develop + - /feature\/.*/ env: matrix: @@ -28,10 +25,12 @@ matrix: include: - os: linux - env: TOOLSET=gcc COMPILER=g++ CXXSTD=c++03 + compiler: g++ + env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11 - os: linux - env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=c++03 + compiler: g++-4.7 + env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11 addons: apt: packages: @@ -40,34 +39,17 @@ matrix: - ubuntu-toolchain-r-test - os: linux - env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=c++11 - addons: - apt: - packages: - - g++-4.7 - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=c++03 + compiler: g++-4.8 + 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.8 CXXSTD=c++11 - addons: - apt: - packages: - - g++-4.8 - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++03 + compiler: g++-4.9 + env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11 addons: apt: packages: @@ -76,16 +58,8 @@ matrix: - ubuntu-toolchain-r-test - os: linux - env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++11 - addons: - apt: - packages: - - g++-4.9 - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++03 + compiler: g++-5 + env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=03,11,14,1z addons: apt: packages: @@ -94,25 +68,8 @@ matrix: - ubuntu-toolchain-r-test - os: linux - env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++11 - addons: - apt: - packages: - - g++-5 - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 - addons: - apt: - packages: - - g++-5 - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 + compiler: g++-6 + env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03,11,14,1z addons: apt: packages: @@ -121,60 +78,35 @@ matrix: - ubuntu-toolchain-r-test - os: linux - env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 + dist: trusty + compiler: g++-7 + env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17 addons: apt: packages: - - g++-6 + - g++-7 sources: - ubuntu-toolchain-r-test - os: linux - env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 - addons: - apt: - packages: - - g++-6 - sources: - - ubuntu-toolchain-r-test + compiler: clang++ + env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11 - os: linux - env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z - addons: - apt: - packages: - - g++-6 - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++03 - - - os: linux - env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11 - - - os: linux - env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=c++03 + compiler: clang++-3.5 + env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11,14,1z addons: apt: packages: - clang-3.5 + - libstdc++-4.9-dev sources: - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.5 - os: linux - env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=c++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=c++03 + compiler: clang++-3.6 + env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11,14,1z addons: apt: packages: @@ -184,17 +116,8 @@ matrix: - llvm-toolchain-precise-3.6 - os: linux - env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++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=c++03 + compiler: clang++-3.7 + env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z addons: apt: packages: @@ -204,110 +127,59 @@ matrix: - llvm-toolchain-precise-3.7 - os: linux - env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++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=c++03 + compiler: clang++-3.8 + 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.8 CXXSTD=c++11 - addons: - apt: - packages: - - clang-3.8 - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.8 - - - os: linux - env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++14 - addons: - apt: - packages: - - clang-3.8 - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.8 - - - os: linux - env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++1z - addons: - apt: - packages: - - clang-3.8 - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.8 - - - os: linux - env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++03 + compiler: clang++-3.9 + 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 - env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++11 + compiler: clang++-4.0 + env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03,11,14,1z addons: apt: packages: - - clang-3.9 + - clang-4.0 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.9 + - llvm-toolchain-trusty-4.0 - os: linux - env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++14 + compiler: clang++-5.0 + env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=03,11,14,1z addons: apt: packages: - - clang-3.9 + - clang-5.0 sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.9 - - - os: linux - 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 + - llvm-toolchain-trusty-5.0 - os: osx - env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++03 - - - os: osx - env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11 - - - os: osx - env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 - - - os: osx - env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++1z + compiler: clang++ + env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z 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 + - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root - cd boost-root - git submodule update --init tools/build - git submodule update --init libs/config @@ -319,8 +191,8 @@ install: script: - |- - echo "using $TOOLSET : : $COMPILER : -std=$CXXSTD ;" > ~/user-config.jam - - ./b2 libs/typeof/test toolset=$TOOLSET + echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam + - ./b2 libs/smart_ptr/test toolset=$TOOLSET cxxstd=$CXXSTD notifications: email: From e9f4579047f51fdcdb442b779d064091fe190e93 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 4 Nov 2017 16:26:08 +0200 Subject: [PATCH 6/6] Test typeof instead of smart_ptr :-/ --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 80394a0..545c7a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -192,7 +192,7 @@ install: script: - |- echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam - - ./b2 libs/smart_ptr/test toolset=$TOOLSET cxxstd=$CXXSTD + - ./b2 libs/typeof/test toolset=$TOOLSET cxxstd=$CXXSTD notifications: email: