Sync from upstream.

This commit is contained in:
Rene Rivera
2024-04-20 15:33:47 -05:00
6 changed files with 138 additions and 47 deletions

View File

@@ -101,7 +101,6 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
"cppalliance/droneubuntu1404:1", "cppalliance/droneubuntu1404:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-4.6', CXXSTD: '0x', ADDRMD: '32,64' }, { TOOLSET: 'gcc', COMPILER: 'g++-4.6', CXXSTD: '0x', ADDRMD: '32,64' },
"g++-4.6-multilib", "g++-4.6-multilib",
[ "ppa:ubuntu-toolchain-r/test" ],
), ),
linux_pipeline( linux_pipeline(
@@ -109,7 +108,6 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
"cppalliance/droneubuntu1404:1", "cppalliance/droneubuntu1404:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-4.7', CXXSTD: '0x', ADDRMD: '32,64' }, { TOOLSET: 'gcc', COMPILER: 'g++-4.7', CXXSTD: '0x', ADDRMD: '32,64' },
"g++-4.7-multilib", "g++-4.7-multilib",
[ "ppa:ubuntu-toolchain-r/test" ],
), ),
linux_pipeline( linux_pipeline(
@@ -119,11 +117,16 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
), ),
linux_pipeline( linux_pipeline(
"Linux 14.04 GCC 4.9 32/64", "Linux 16.04 GCC 4.9 32/64",
"cppalliance/droneubuntu1404:1", "cppalliance/droneubuntu1604:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-4.9', CXXSTD: '11', ADDRMD: '32,64' }, { TOOLSET: 'gcc', COMPILER: 'g++-4.9', CXXSTD: '11', ADDRMD: '32,64' },
"g++-4.9-multilib", "g++-4.9-multilib",
[ "ppa:ubuntu-toolchain-r/test" ], ),
linux_pipeline(
"Linux 16.04 GCC 5* 32/64",
"cppalliance/droneubuntu1604:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11,14', ADDRMD: '32,64' },
), ),
linux_pipeline( linux_pipeline(
@@ -141,37 +144,44 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
), ),
linux_pipeline( linux_pipeline(
"Linux 22.04 GCC 12 32 ASAN", "Linux 22.04 GCC 12 32/64",
"cppalliance/droneubuntu2204:1", "cppalliance/droneubuntu2204:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '11,14,17,20', ADDRMD: '32' } + asan, { TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '11,14,17,20', ADDRMD: '32,64' },
"g++-12-multilib", "g++-12-multilib",
), ),
linux_pipeline( linux_pipeline(
"Linux 22.04 GCC 12 64 ASAN", "Linux 23.04 GCC 13 32 UBSAN",
"cppalliance/droneubuntu2204:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '11,14,17,20', ADDRMD: '64' } + asan,
"g++-12-multilib",
),
linux_pipeline(
"Linux 23.04 GCC 13 32/64",
"cppalliance/droneubuntu2304:1", "cppalliance/droneubuntu2304:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32,64' }, { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + ubsan,
"g++-13-multilib", "g++-13-multilib",
), ),
linux_pipeline( linux_pipeline(
"Linux 22.04 Clang 15 UBSAN", "Linux 23.04 GCC 13 64 UBSAN",
"cppalliance/droneubuntu2204:1", "cppalliance/droneubuntu2304:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-15', CXXSTD: '11,14,17,20,2b' } + ubsan, { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + ubsan,
"clang-15", "g++-13-multilib",
), ),
linux_pipeline( linux_pipeline(
"Linux 22.04 Clang 15 ASAN", "Linux 23.04 GCC 13 32 ASAN",
"cppalliance/droneubuntu2304:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + asan,
"g++-13-multilib",
),
linux_pipeline(
"Linux 23.04 GCC 13 64 ASAN",
"cppalliance/droneubuntu2304:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + asan,
"g++-13-multilib",
),
linux_pipeline(
"Linux 22.04 Clang 15",
"cppalliance/droneubuntu2204:1", "cppalliance/droneubuntu2204:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-15', CXXSTD: '11,14,17,20,2b' } + asan, { TOOLSET: 'clang', COMPILER: 'clang++-15', CXXSTD: '11,14,17,20,2b' },
"clang-15", "clang-15",
), ),
@@ -182,6 +192,20 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
"clang-16", "clang-16",
), ),
linux_pipeline(
"Linux 23.10 Clang 17 UBSAN",
"cppalliance/droneubuntu2310:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-17', CXXSTD: '11,14,17,20,2b' } + ubsan,
"clang-17",
),
linux_pipeline(
"Linux 23.10 Clang 17 ASAN",
"cppalliance/droneubuntu2310:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-17', CXXSTD: '11,14,17,20,2b' } + asan,
"clang-17",
),
macos_pipeline( macos_pipeline(
"MacOS 10.15 Xcode 12.2 UBSAN", "MacOS 10.15 Xcode 12.2 UBSAN",
{ TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '11,14,1z' } + ubsan, { TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '11,14,1z' } + ubsan,
@@ -204,9 +228,27 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
xcode_version = "13.4.1", osx_version = "monterey", arch = "arm64", xcode_version = "13.4.1", osx_version = "monterey", arch = "arm64",
), ),
windows_pipeline(
"Windows VS2015 msvc-14.0",
"cppalliance/dronevs2015",
{ TOOLSET: 'msvc-14.0', CXXSTD: '14,latest', B2_DONT_EMBED_MANIFEST: '1' },
),
windows_pipeline( windows_pipeline(
"Windows VS2017 msvc-14.1", "Windows VS2017 msvc-14.1",
"cppalliance/dronevs2017", "cppalliance/dronevs2017",
{ TOOLSET: 'msvc-14.1', CXXSTD: '14,17,latest' }, { TOOLSET: 'msvc-14.1', CXXSTD: '14,17,latest' },
), ),
windows_pipeline(
"Windows VS2019 msvc-14.2",
"cppalliance/dronevs2019",
{ TOOLSET: 'msvc-14.2', CXXSTD: '14,17,20,latest' },
),
windows_pipeline(
"Windows VS2022 msvc-14.3",
"cppalliance/dronevs2022:1",
{ TOOLSET: 'msvc-14.3', CXXSTD: '14,17,20,latest' },
),
] ]

View File

@@ -7,6 +7,8 @@
set LIBRARY=%1 set LIBRARY=%1
set DRONE_BUILD_DIR=%CD% set DRONE_BUILD_DIR=%CD%
echo %DRONE_STAGE_MACHINE%
set BOOST_BRANCH=develop set BOOST_BRANCH=develop
if "%DRONE_BRANCH%" == "master" set BOOST_BRANCH=master if "%DRONE_BRANCH%" == "master" set BOOST_BRANCH=master
cd .. cd ..

View File

@@ -6,6 +6,8 @@
set -ex set -ex
export PATH=~/.local/bin:/usr/local/bin:$PATH export PATH=~/.local/bin:/usr/local/bin:$PATH
uname -a
echo $DRONE_STAGE_MACHINE
DRONE_BUILD_DIR=$(pwd) DRONE_BUILD_DIR=$(pwd)
@@ -22,4 +24,4 @@ python tools/boostdep/depinst/depinst.py $LIBRARY
./b2 -d0 headers ./b2 -d0 headers
echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
./b2 -j3 libs/$LIBRARY/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${ADDRMD:+address-model=$ADDRMD} ${UBSAN:+undefined-sanitizer=norecover debug-symbols=on} ${ASAN:+address-sanitizer=norecover debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS} ./b2 -j2 libs/$LIBRARY/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${ADDRMD:+address-model=$ADDRMD} ${UBSAN:+undefined-sanitizer=norecover debug-symbols=on} ${ASAN:+address-sanitizer=norecover debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}

View File

@@ -17,22 +17,34 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- toolset: gcc-4.7
cxxstd: "11"
container: ubuntu:16.04
os: ubuntu-latest
install: g++-4.7-multilib
address-model: 32,64
- toolset: gcc-4.8 - toolset: gcc-4.8
cxxstd: "11" cxxstd: "11"
os: ubuntu-latest
container: ubuntu:18.04 container: ubuntu:18.04
os: ubuntu-latest
install: g++-4.8-multilib install: g++-4.8-multilib
address-model: 32,64 address-model: 32,64
- toolset: gcc-4.9
cxxstd: "11"
container: ubuntu:16.04
os: ubuntu-latest
install: g++-4.9-multilib
address-model: 32,64
- toolset: gcc-5 - toolset: gcc-5
cxxstd: "11,14,1z" cxxstd: "11,14,1z"
os: ubuntu-latest
container: ubuntu:18.04 container: ubuntu:18.04
os: ubuntu-latest
install: g++-5-multilib install: g++-5-multilib
address-model: 32,64 address-model: 32,64
- toolset: gcc-6 - toolset: gcc-6
cxxstd: "11,14,1z" cxxstd: "11,14,1z"
os: ubuntu-latest
container: ubuntu:18.04 container: ubuntu:18.04
os: ubuntu-latest
install: g++-6-multilib install: g++-6-multilib
address-model: 32,64 address-model: 32,64
- toolset: gcc-7 - toolset: gcc-7
@@ -65,6 +77,12 @@ jobs:
os: ubuntu-22.04 os: ubuntu-22.04
install: g++-12-multilib install: g++-12-multilib
address-model: 32,64 address-model: 32,64
- toolset: gcc-13
cxxstd: "11,14,17,20,2b"
container: ubuntu:23.04
os: ubuntu-latest
install: g++-13-multilib
address-model: 32,64
- toolset: clang - toolset: clang
compiler: clang++-3.9 compiler: clang++-3.9
cxxstd: "11,14" cxxstd: "11,14"
@@ -121,18 +139,33 @@ jobs:
- toolset: clang - toolset: clang
compiler: clang++-13 compiler: clang++-13
cxxstd: "11,14,17,20,2b" cxxstd: "11,14,17,20,2b"
os: ubuntu-22.04 container: ubuntu:22.04
os: ubuntu-latest
install: clang-13 install: clang-13
- toolset: clang - toolset: clang
compiler: clang++-14 compiler: clang++-14
cxxstd: "11,14,17,20,2b" cxxstd: "11,14,17,20,2b"
os: ubuntu-22.04 container: ubuntu:22.04
os: ubuntu-latest
install: clang-14 install: clang-14
- toolset: clang - toolset: clang
compiler: clang++-15 compiler: clang++-15
cxxstd: "11,14,17,20,2b" cxxstd: "11,14,17,20,2b"
os: ubuntu-22.04 container: ubuntu:22.04
os: ubuntu-latest
install: clang-15 install: clang-15
- toolset: clang
compiler: clang++-16
cxxstd: "11,14,17,20,2b"
container: ubuntu:23.04
os: ubuntu-latest
install: clang-16
- toolset: clang
compiler: clang++-17
cxxstd: "11,14,17,20,2b"
container: ubuntu:23.10
os: ubuntu-latest
install: clang-17
- toolset: clang - toolset: clang
cxxstd: "11,14,17,2a" cxxstd: "11,14,17,2a"
os: macos-11 os: macos-11
@@ -142,6 +175,9 @@ jobs:
- toolset: clang - toolset: clang
cxxstd: "11,14,17,20,2b" cxxstd: "11,14,17,20,2b"
os: macos-13 os: macos-13
- toolset: clang
cxxstd: "11,14,17,20,2b"
os: macos-14
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
container: ${{matrix.container}} container: ${{matrix.container}}
@@ -157,7 +193,7 @@ jobs:
if: matrix.container if: matrix.container
run: | run: |
apt-get update apt-get update
apt-get -y install sudo python git g++ apt-get -y install sudo python3 git g++
- name: Install packages - name: Install packages
if: matrix.install if: matrix.install
@@ -183,7 +219,7 @@ jobs:
cd boost-root cd boost-root
cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
git submodule update --init tools/boostdep git submodule update --init tools/boostdep
python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY python3 tools/boostdep/depinst/depinst.py $LIBRARY
./bootstrap.sh ./bootstrap.sh
./b2 -d0 headers ./b2 -d0 headers
@@ -227,7 +263,7 @@ jobs:
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Setup Boost - name: Setup Boost
shell: cmd shell: cmd
@@ -271,7 +307,7 @@ jobs:
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install packages - name: Install packages
if: matrix.install if: matrix.install
@@ -319,7 +355,7 @@ jobs:
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install packages - name: Install packages
if: matrix.install if: matrix.install
@@ -377,7 +413,7 @@ jobs:
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install packages - name: Install packages
if: matrix.install if: matrix.install
@@ -430,7 +466,7 @@ jobs:
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Setup Boost - name: Setup Boost
shell: cmd shell: cmd
@@ -479,7 +515,7 @@ jobs:
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Setup Boost - name: Setup Boost
shell: cmd shell: cmd
@@ -546,7 +582,7 @@ jobs:
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Setup Boost - name: Setup Boost
shell: cmd shell: cmd

View File

@@ -15,21 +15,25 @@ branches:
environment: environment:
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
TOOLSET: msvc-12.0,msvc-14.0 TOOLSET: msvc-12.0
ADDRMD: 32,64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
TOOLSET: msvc-14.0
CXXSTD: 14,latest
ADDRMD: 32,64 ADDRMD: 32,64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
TOOLSET: msvc-14.1,clang-win TOOLSET: msvc-14.1
CXXSTD: 14,17 CXXSTD: 14,17,latest
ADDRMD: 32,64 ADDRMD: 32,64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
TOOLSET: msvc-14.2 TOOLSET: clang-win
CXXSTD: 14,17 CXXSTD: 14,17,latest
ADDRMD: 32,64 ADDRMD: 32,64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
ADDPATH: C:\cygwin\bin; ADDPATH: C:\cygwin\bin;
TOOLSET: gcc TOOLSET: gcc
CXXSTD: 11,14,1z CXXSTD: 11,14,1z
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
ADDPATH: C:\cygwin64\bin; ADDPATH: C:\cygwin64\bin;
TOOLSET: gcc TOOLSET: gcc
CXXSTD: 11,14,1z CXXSTD: 11,14,1z
@@ -37,8 +41,12 @@ environment:
ADDPATH: C:\mingw\bin; ADDPATH: C:\mingw\bin;
TOOLSET: gcc TOOLSET: gcc
CXXSTD: 11,14,1z CXXSTD: 11,14,1z
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin; ADDPATH: C:\mingw-w64\i686-8.1.0-posix-dwarf-rt_v6-rev0\mingw32\bin;
TOOLSET: gcc
CXXSTD: 11,14,1z
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
ADDPATH: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;
TOOLSET: gcc TOOLSET: gcc
CXXSTD: 11,14,1z CXXSTD: 11,14,1z

View File

@@ -12,7 +12,8 @@ http://www.boost.org/LICENSE_1_0.txt
## Changes in 1.84.0 ## Changes in 1.84.0
* {cpp}03 is no longer supported. * {cpp}03 is no longer supported; a {cpp}11 compiler is required.
(This includes GCC 4.6 or later, and MSVC 12.0 (VS 2013) or later.)
## Changes in 1.75.0 ## Changes in 1.75.0