Skip to content

Commit cf0d343

Browse files
mborlandmborland
authored
Merge pull request #1136 from boostorg/update-ci
Update CI
2 parents 3561273 + 1ec1661 commit cf0d343

File tree

3 files changed

+71
-8
lines changed

3 files changed

+71
-8
lines changed

‎.drone.star

+6-5
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ def main(ctx):
3232
#
3333
# Sanitizers:
3434
#
35-
result.append(linux_cxx("Ubuntu g++-12 C++20 ASAN" + " " + suite, "g++-12", packages="g++-12", privileged=True, buildtype="boost", image="cppalliance/droneubuntu2204:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-12', 'CXXSTD': 'gnu++20', 'TEST_SUITE': suite, 'OPTIONS': '<cxxflags>-fsanitize=address <linkflags>-fsanitize=address <cxxflags>-DBOOST_CI_SANITIZER_BUILD' }, globalenv=globalenv))
36-
result.append(linux_cxx("Ubuntu g++-12 C++20 USAN" + " " + suite, "g++-12", packages="g++-12", privileged=True, buildtype="boost", image="cppalliance/droneubuntu2204:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-12', 'CXXSTD': 'gnu++20', 'TEST_SUITE': suite, 'OPTIONS': '<cxxflags>-fsanitize=undefined <linkflags>-fsanitize=undefined <cxxflags>-DBOOST_CI_SANITIZER_BUILD' }, globalenv=globalenv))
37-
result.append(linux_cxx("Ubuntu g++-12 C++20 TSAN" + " " + suite, "g++-12", packages="g++-12", privileged=True, buildtype="boost", image="cppalliance/droneubuntu2204:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-12', 'CXXSTD': 'gnu++20', 'TEST_SUITE': suite, 'OPTIONS': '<cxxflags>-fsanitize=thread <linkflags>-fsanitize=thread <cxxflags>-DBOOST_CI_SANITIZER_BUILD' }, globalenv=globalenv))
38-
result.append(linux_cxx("Ubuntu clang++-14 C++20 ISAN" + " " + suite, "clang++-14", packages="clang-14", privileged=True, buildtype="boost", image="cppalliance/droneubuntu2204:1", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++-14', 'CXXSTD': 'gnu++20', 'TEST_SUITE': suite, 'OPTIONS': '<cxxflags>-fsanitize=integer <linkflags>-fsanitize=integer' }, globalenv=globalenv))
35+
result.append(linux_cxx("Ubuntu g++-14 C++20 ASAN" + " " + suite, "g++-14", packages="g++-14", privileged=True, buildtype="boost", image="cppalliance/droneubuntu2404:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-14', 'CXXSTD': 'gnu++20', 'TEST_SUITE': suite, 'OPTIONS': '<cxxflags>-fsanitize=address <linkflags>-fsanitize=address <cxxflags>-DBOOST_CI_SANITIZER_BUILD' }, globalenv=globalenv))
36+
result.append(linux_cxx("Ubuntu g++-14 C++20 USAN" + " " + suite, "g++-14", packages="g++-14", privileged=True, buildtype="boost", image="cppalliance/droneubuntu2404:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-14', 'CXXSTD': 'gnu++20', 'TEST_SUITE': suite, 'OPTIONS': '<cxxflags>-fsanitize=undefined <linkflags>-fsanitize=undefined <cxxflags>-DBOOST_CI_SANITIZER_BUILD' }, globalenv=globalenv))
37+
result.append(linux_cxx("Ubuntu g++-14 C++20 TSAN" + " " + suite, "g++-14", packages="g++-14", privileged=True, buildtype="boost", image="cppalliance/droneubuntu2404:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-14', 'CXXSTD': 'gnu++20', 'TEST_SUITE': suite, 'OPTIONS': '<cxxflags>-fsanitize=thread <linkflags>-fsanitize=thread <cxxflags>-DBOOST_CI_SANITIZER_BUILD' }, globalenv=globalenv))
38+
result.append(linux_cxx("Ubuntu clang++-18 C++20 ISAN" + " " + suite, "clang++-18", packages="clang-18", privileged=True, buildtype="boost", image="cppalliance/droneubuntu2404:1", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++-18', 'CXXSTD': 'gnu++20', 'TEST_SUITE': suite, 'OPTIONS': '<cxxflags>-fsanitize=integer <linkflags>-fsanitize=integer' }, globalenv=globalenv))
3939

4040
for suite in things_to_test:
4141
for cxx in gnu_5_stds:
@@ -63,7 +63,8 @@ def main(ctx):
6363
result.append(osx_cxx("M1 Clang " + cxx + " " + suite, "clang++", buildscript="drone", buildtype="boost", xcode_version="14.1", environment={'TOOLSET': 'clang', 'CXXSTD': cxx, 'TEST_SUITE': suite, 'DEFINE': 'BOOST_MATH_NO_REAL_CONCEPT_TESTS,BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS,BOOST_MATH_MULTI_ARCH_CI_RUN', }, globalenv=globalenv))
6464
for suite in gcc13_things_to_test:
6565
for cxx in gcc13_stds:
66-
result.append(linux_cxx("Ubuntu g++-13 " + cxx + " " + suite, "g++-13", packages="g++-13", buildtype="boost", image="cppalliance/droneubuntu2304:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-13', 'CXXSTD': cxx, 'TEST_SUITE': suite, }, globalenv=globalenv))
66+
result.append(linux_cxx("Ubuntu g++-13 " + cxx + " " + suite, "g++-13", packages="g++-13", buildtype="boost", image="cppalliance/droneubuntu2404:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-13', 'CXXSTD': cxx, 'TEST_SUITE': suite, }, globalenv=globalenv))
67+
result.append(linux_cxx("Ubuntu g++-14 " + cxx + " " + suite, "g++-14", packages="g++-14", buildtype="boost", image="cppalliance/droneubuntu2404:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-14', 'CXXSTD': cxx, 'TEST_SUITE': suite, }, globalenv=globalenv))
6768

6869
return result
6970

‎.github/workflows/ci.yml

+63-3
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,72 @@ concurrency:
1919
cancel-in-progress: true
2020

2121
jobs:
22+
ubuntu-noble:
23+
runs-on: ubuntu-24.04
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
compiler: [ g++-14, clang++-16, clang++-17, clang++-18 ]
28+
standard: [ c++20 ]
29+
suite: [ github_ci_block_1, github_ci_block_2 ]
30+
steps:
31+
- uses: actions/checkout@v4
32+
with:
33+
fetch-depth: '0'
34+
- name: Set TOOLSET
35+
run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
36+
- name: Add repository
37+
continue-on-error: true
38+
id: addrepo
39+
run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
40+
- name: Retry Add Repo
41+
continue-on-error: true
42+
id: retry1
43+
if: steps.addrepo.outcome=='failure'
44+
run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
45+
- name: Retry Add Repo 2
46+
continue-on-error: true
47+
id: retry2
48+
if: steps.retry1.outcome=='failure'
49+
run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
50+
- name: Install packages
51+
run: sudo apt-get install -y g++-13 g++-14 clang-16 clang-17 clang-18 libgmp-dev libmpfr-dev libfftw3-dev
52+
- name: Checkout main boost
53+
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
54+
- name: Update tools/boostdep
55+
run: git submodule update --init tools/boostdep
56+
working-directory: ../boost-root
57+
- name: Copy files
58+
run: cp -r $GITHUB_WORKSPACE/* libs/math
59+
working-directory: ../boost-root
60+
- name: Install deps
61+
run: python tools/boostdep/depinst/depinst.py math -I example -I tools
62+
working-directory: ../boost-root
63+
- name: Bootstrap
64+
run: ./bootstrap.sh
65+
working-directory: ../boost-root
66+
- name: Generate headers
67+
run: ./b2 headers
68+
working-directory: ../boost-root
69+
- name: Generate user config
70+
run: 'echo "using $TOOLSET : : ${{ matrix.compiler }} : <cxxflags>-std=${{ matrix.standard }} ;" > ~/user-config.jam'
71+
working-directory: ../boost-root
72+
- name: Config info install
73+
run: ../../../b2 config_info_travis_install toolset=$TOOLSET
74+
working-directory: ../boost-root/libs/config/test
75+
- name: Config info
76+
run: ./config_info_travis
77+
working-directory: ../boost-root/libs/config/test
78+
- name: Test
79+
run: ../../../b2 toolset=$TOOLSET ${{ matrix.suite }} define=CI_SUPPRESS_KNOWN_ISSUES define=SLOW_COMPILER define=BOOST_MATH_RUN_MP_TESTS
80+
working-directory: ../boost-root/libs/math/test
81+
2282
ubuntu-jammy:
2383
runs-on: ubuntu-22.04
2484
strategy:
2585
fail-fast: false
2686
matrix:
27-
compiler: [ g++-12, clang++-14 ]
87+
compiler: [ g++-12, clang++-14, clang++-15 ]
2888
standard: [ c++14, c++17 ]
2989
suite: [ github_ci_block_1, github_ci_block_2 ]
3090
steps:
@@ -48,7 +108,7 @@ jobs:
48108
if: steps.retry1.outcome=='failure'
49109
run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
50110
- name: Install packages
51-
run: sudo apt-get install -y g++-12 clang-14 libgmp-dev libmpfr-dev libfftw3-dev
111+
run: sudo apt-get install -y g++-12 clang-14 clang-15 libgmp-dev libmpfr-dev libfftw3-dev
52112
- name: Checkout main boost
53113
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
54114
- name: Update tools/boostdep
@@ -185,7 +245,7 @@ jobs:
185245
strategy:
186246
fail-fast: false
187247
matrix:
188-
toolset: [ msvc-14.0, msvc-14.2 ]
248+
toolset: [ msvc-14.2 ]
189249
standard: [ 14, 17 ]
190250
suite: [ github_ci_block_1, github_ci_block_2 ]
191251
steps:

‎test/test_autodiff_5.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(cbrt_hpp, T, all_float_types) {
4646
}
4747
}
4848

49+
#if !defined(__APPLE__)
4950
BOOST_AUTO_TEST_CASE_TEMPLATE(chebyshev_hpp, T, all_float_types) {
5051
using test_constants = test_constants_t<T>;
5152
static constexpr auto m = test_constants::order;
@@ -87,6 +88,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(chebyshev_hpp, T, all_float_types) {
8788
}
8889
}
8990
}
91+
#endif
9092

9193
BOOST_AUTO_TEST_CASE_TEMPLATE(cospi_hpp, T, all_float_types) {
9294
using test_constants = test_constants_t<T>;

0 commit comments

Comments
 (0)