Skip to content

Commit 131c3ea

Browse files
felix-salfelderfelix-salfelder
committed
"Merge" 'master' into bucket_sorter
This is not a merge, which is completely impossible due to whitespace changes. Instead, manually applying the patch produced by $ git diff -w c583bfa...e62d657 and make it look like a merge.
2 parents e62d657 + c583bfa commit 131c3ea

File tree

761 files changed

+79669
-73377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

761 files changed

+79669
-73377
lines changed

‎.clang-format

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BasedOnStyle: WebKit
2-
Standard: Cpp11
2+
Standard: Cpp03
33
AlignAfterOpenBracket: false
44
AlignEscapedNewlinesLeft: true
55
AlwaysBreakAfterDefinitionReturnType: None
@@ -13,4 +13,3 @@ SortIncludes: false
1313
AlignTrailingComments: false
1414

1515
SpacesInAngles: true
16-

‎.drone.star

+161
Large diffs are not rendered by default.

‎.drone/after-success.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+

‎.drone/before-install.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+

‎.drone/before-script.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+

‎.drone/boost.sh

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#!/bin/bash
2+
3+
set -ex
4+
export TRAVIS_BUILD_DIR=$(pwd)
5+
export DRONE_BUILD_DIR=$(pwd)
6+
export TRAVIS_BRANCH=$DRONE_BRANCH
7+
export VCS_COMMIT_ID=$DRONE_COMMIT
8+
export GIT_COMMIT=$DRONE_COMMIT
9+
export PATH=~/.local/bin:/usr/local/bin:$PATH
10+
11+
echo '==================================> BEFORE_INSTALL'
12+
13+
. .drone/before-install.sh
14+
15+
echo '==================================> INSTALL'
16+
17+
cd ..
18+
git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
19+
cd boost-root
20+
git submodule update --init tools/build
21+
git submodule update --init libs/config
22+
git submodule update --init tools/boost_install
23+
git submodule update --init libs/headers
24+
git submodule update --init tools/boostdep
25+
cp -r $TRAVIS_BUILD_DIR/* libs/graph
26+
python tools/boostdep/depinst/depinst.py graph
27+
./bootstrap.sh
28+
./b2 headers
29+
30+
echo '==================================> BEFORE_SCRIPT'
31+
32+
. $DRONE_BUILD_DIR/.drone/before-script.sh
33+
34+
echo '==================================> SCRIPT'
35+
36+
echo "using $TOOLSET : : $COMPILER : $OPTIONS ;" > ~/user-config.jam
37+
(cd libs/config/test && ../../../b2 cxxstd=$CXXSTD config_info_travis_install toolset=$TOOLSET && ./config_info_travis)
38+
(cd libs/graph/test && ../../../b2 -j3 cxxstd=$CXXSTD toolset=$TOOLSET define=CI_SUPPRESS_KNOWN_ISSUES)
39+
40+
echo '==================================> AFTER_SUCCESS'
41+
42+
. $DRONE_BUILD_DIR/.drone/after-success.sh

‎.github/workflows/ci.yml

+225
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,225 @@
1+
# Copyright 2020 Evan Miller
2+
# Copyright 2020 Matt Borland
3+
# Copyright 2021 John Maddock
4+
# Distributed under the Boost Software License, Version 1.0.
5+
# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
6+
7+
name: CI
8+
on: [ push, pull_request ]
9+
jobs:
10+
ubuntu-focal:
11+
runs-on: ubuntu-20.04
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
# Removed g++-10 because of an ICE; meant to be fixed in 10.2?
16+
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94938
17+
compiler: [ g++-9, clang++-10 ]
18+
steps:
19+
- uses: actions/checkout@v2
20+
with:
21+
fetch-depth: '0'
22+
- uses: mstachniuk/ci-skip@v1
23+
with:
24+
commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE]'
25+
commit-filter-separator: ';'
26+
fail-fast: true
27+
- name: Set TOOLSET
28+
run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
29+
- name: Add repository
30+
run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
31+
- name: Install packages
32+
run: sudo apt install g++-9 clang-10
33+
- name: Checkout main boost
34+
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
35+
- name: Update tools/boostdep
36+
run: git submodule update --init tools/boostdep
37+
working-directory: ../boost-root
38+
- name: Copy files
39+
run: cp -r $GITHUB_WORKSPACE/* libs/graph
40+
working-directory: ../boost-root
41+
- name: Install deps
42+
run: python tools/boostdep/depinst/depinst.py graph
43+
working-directory: ../boost-root
44+
- name: Bootstrap
45+
run: ./bootstrap.sh
46+
working-directory: ../boost-root
47+
- name: Generate headers
48+
run: ./b2 headers
49+
working-directory: ../boost-root
50+
- name: Generate user config
51+
run: 'echo "using $TOOLSET : : ${{ matrix.compiler }} ;" > ~/user-config.jam'
52+
working-directory: ../boost-root
53+
- name: Config info
54+
run: ../../../b2 print_config_info toolset=$TOOLSET cxxstd=03,11,14,17,2a
55+
working-directory: ../boost-root/libs/config/test
56+
- name: Test
57+
run: ../../../b2 toolset=$TOOLSET cxxstd=03,11,14,17,2a
58+
working-directory: ../boost-root/libs/graph/test
59+
ubuntu-bionic:
60+
runs-on: ubuntu-18.04
61+
strategy:
62+
fail-fast: false
63+
matrix:
64+
compiler: [ g++-7, g++-8, clang++-7, clang++-8 ]
65+
steps:
66+
- uses: actions/checkout@v2
67+
with:
68+
fetch-depth: '0'
69+
- uses: mstachniuk/ci-skip@v1
70+
with:
71+
commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE]'
72+
commit-filter-separator: ';'
73+
fail-fast: true
74+
- name: Set TOOLSET
75+
run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
76+
- name: Add repository
77+
run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
78+
- name: Install packages
79+
run: sudo apt install g++-7 g++-8 clang-7 clang-8
80+
- name: Checkout main boost
81+
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
82+
- name: Update tools/boostdep
83+
run: git submodule update --init tools/boostdep
84+
working-directory: ../boost-root
85+
- name: Copy files
86+
run: cp -r $GITHUB_WORKSPACE/* libs/graph
87+
working-directory: ../boost-root
88+
- name: Install deps
89+
run: python tools/boostdep/depinst/depinst.py graph
90+
working-directory: ../boost-root
91+
- name: Bootstrap
92+
run: ./bootstrap.sh
93+
working-directory: ../boost-root
94+
- name: Generate headers
95+
run: ./b2 headers
96+
working-directory: ../boost-root
97+
- name: Generate user config
98+
run: 'echo "using $TOOLSET : : ${{ matrix.compiler }} ;" > ~/user-config.jam'
99+
working-directory: ../boost-root
100+
- name: Config info install
101+
run: ../../../b2 print_config_info toolset=$TOOLSET cxxstd=03,11,14,17
102+
working-directory: ../boost-root/libs/config/test
103+
- name: Test
104+
run: ../../../b2 toolset=$TOOLSET cxxstd=03,11,14,17
105+
working-directory: ../boost-root/libs/graph/test
106+
macos:
107+
runs-on: macos-latest
108+
strategy:
109+
fail-fast: false
110+
matrix:
111+
toolset: [ clang ]
112+
steps:
113+
- uses: actions/checkout@v2
114+
with:
115+
fetch-depth: '0'
116+
- uses: mstachniuk/ci-skip@v1
117+
with:
118+
commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[linux];[Linux];[LINUX]'
119+
commit-filter-separator: ';'
120+
fail-fast: true
121+
- name: Checkout main boost
122+
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
123+
- name: Update tools/boostdep
124+
run: git submodule update --init tools/boostdep
125+
working-directory: ../boost-root
126+
- name: Copy files
127+
run: cp -r $GITHUB_WORKSPACE/* libs/graph
128+
working-directory: ../boost-root
129+
- name: Install deps
130+
run: python tools/boostdep/depinst/depinst.py graph
131+
working-directory: ../boost-root
132+
- name: Bootstrap
133+
run: ./bootstrap.sh
134+
working-directory: ../boost-root
135+
- name: Generate headers
136+
run: ./b2 headers
137+
working-directory: ../boost-root
138+
- name: Config info
139+
run: ../../../b2 print_config_info toolset=${{ matrix.toolset }} cxxstd=03,11,14,17,2a
140+
working-directory: ../boost-root/libs/config/test
141+
- name: Test
142+
run: ../../../b2 toolset=${{ matrix.toolset }} cxxstd=03,11,14,17,2a define=CI_SUPPRESS_KNOWN_ISSUES
143+
working-directory: ../boost-root/libs/graph/test
144+
windows_msvc_14_0:
145+
runs-on: windows-2019
146+
defaults:
147+
run:
148+
shell: cmd
149+
strategy:
150+
fail-fast: false
151+
matrix:
152+
toolset: [ msvc-14.0 ]
153+
steps:
154+
- uses: actions/checkout@v2
155+
with:
156+
fetch-depth: '0'
157+
- uses: mstachniuk/ci-skip@v1
158+
with:
159+
commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[linux];[Linux];[LINUX]'
160+
commit-filter-separator: ';'
161+
fail-fast: true
162+
- name: Checkout main boost
163+
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
164+
- name: Update tools/boostdep
165+
run: git submodule update --init tools/boostdep
166+
working-directory: ../boost-root
167+
- name: Copy files
168+
run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\graph
169+
working-directory: ../boost-root
170+
- name: Install deps
171+
run: python tools/boostdep/depinst/depinst.py graph
172+
working-directory: ../boost-root
173+
- name: Bootstrap
174+
run: bootstrap
175+
working-directory: ../boost-root
176+
- name: Generate headers
177+
run: b2 headers
178+
working-directory: ../boost-root
179+
- name: Config info
180+
run: ..\..\..\b2 print_config_info cxxstd=14,17 address-model=64 toolset=msvc-14.0
181+
working-directory: ../boost-root/libs/config/test
182+
- name: Test
183+
run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17 toolset=msvc-14.0
184+
working-directory: ../boost-root/libs/graph/test
185+
windows_msvc_14_2:
186+
runs-on: windows-2019
187+
defaults:
188+
run:
189+
shell: cmd
190+
strategy:
191+
fail-fast: false
192+
matrix:
193+
toolset: [ msvc-14.2 ]
194+
steps:
195+
- uses: actions/checkout@v2
196+
with:
197+
fetch-depth: '0'
198+
- uses: mstachniuk/ci-skip@v1
199+
with:
200+
commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[linux];[Linux];[LINUX]'
201+
commit-filter-separator: ';'
202+
fail-fast: true
203+
- name: Checkout main boost
204+
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
205+
- name: Update tools/boostdep
206+
run: git submodule update --init tools/boostdep
207+
working-directory: ../boost-root
208+
- name: Copy files
209+
run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\graph
210+
working-directory: ../boost-root
211+
- name: Install deps
212+
run: python tools/boostdep/depinst/depinst.py graph
213+
working-directory: ../boost-root
214+
- name: Bootstrap
215+
run: bootstrap
216+
working-directory: ../boost-root
217+
- name: Generate headers
218+
run: b2 headers
219+
working-directory: ../boost-root
220+
- name: Config info
221+
run: ..\..\..\b2 print_config_info cxxstd=14,17,20 address-model=64 toolset=msvc-14.2
222+
working-directory: ../boost-root/libs/config/test
223+
- name: Test
224+
run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17,20 toolset=msvc-14.2
225+
working-directory: ../boost-root/libs/graph/test

0 commit comments

Comments
 (0)