Skip to content

Commit db37368

Browse files
mborlandmborland
authored
Merge pull request #896 from cppalliance/update_ci
Update ci
2 parents f34b02b + 52be07d commit db37368

File tree

4 files changed

+71
-40
lines changed

4 files changed

+71
-40
lines changed

‎.drone.jsonnet‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Copyright 2022, 2023 Peter Dimov
2+
# Copyright 2024, 2025 Matt Borland
23
# Distributed under the Boost Software License, Version 1.0.
34
# https://www.boost.org/LICENSE_1_0.txt
45

@@ -411,16 +412,20 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
411412
["deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main"],
412413
),
413414

414-
macos_pipeline(
415-
"MacOS 12.4 Xcode 13.4.1 UBSAN",
416-
{ TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,17,20,2b' } + ubsan,
417-
xcode_version = "13.4.1", osx_version = "monterey", arch = "arm64",
415+
linux_pipeline(
416+
"Linux 24.04 Clang 19",
417+
"cppalliance/droneubuntu2404:1",
418+
{ TOOLSET: 'clang', COMPILER: 'clang++-19', CXXSTD: '03,11,14,17,20,2b' },
419+
"clang-19",
420+
["deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main"],
418421
),
419422

420-
macos_pipeline(
421-
"MacOS 12.4 Xcode 13.4.1 ASAN",
422-
{ TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,17,20,2b' } + asan,
423-
xcode_version = "13.4.1", osx_version = "monterey", arch = "arm64",
423+
linux_pipeline(
424+
"Linux 24.04 Clang 20",
425+
"cppalliance/droneubuntu2404:1",
426+
{ TOOLSET: 'clang', COMPILER: 'clang++-20', CXXSTD: '03,11,14,17,20,2b' },
427+
"clang-20",
428+
["deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main"],
424429
),
425430

426431
windows_pipeline(

‎.github/workflows/ci.yml‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,15 @@ jobs:
7272
- toolset: gcc-11
7373
cxxstd: "03,11,14,17,20,23"
7474
address_model: 32,64
75-
os: ubuntu-22.04
75+
os: ubuntu-latest
76+
container: ubuntu:22.04
7677
install:
7778
- g++-11-multilib
7879
- toolset: gcc-12
7980
cxxstd: "03,11,14,17,20,23"
8081
address_model: 32,64
81-
os: ubuntu-22.04
82+
os: ubuntu-latest
83+
container: ubuntu:22.04
8284
install:
8385
- g++-12-multilib
8486
# Disabled for now. 22.04 dropped support and 24.04 has internal errors
@@ -92,29 +94,33 @@ jobs:
9294
- toolset: gcc-12
9395
cxxstd: "03-gnu,11-gnu,14-gnu,17-gnu,20-gnu,23-gnu"
9496
address_model: "32"
95-
os: ubuntu-22.04
97+
os: ubuntu-latest
98+
container: ubuntu:22.04
9699
install:
97100
- g++-12-multilib
98101
- toolset: gcc-12
99102
cxxstd: "03-gnu,11-gnu,14-gnu,17-gnu,20-gnu,23-gnu"
100103
address_model: "64"
101-
os: ubuntu-22.04
104+
os: ubuntu-latest
105+
container: ubuntu:22.04
102106
install:
103107
- g++-12-multilib
104108
- name: 32-bit UBSAN
105109
toolset: gcc-12
106110
cxxstd: "03,11,14,17,20,23"
107111
address_model: "32"
108112
ubsan: 1
109-
os: ubuntu-22.04
113+
os: ubuntu-latest
114+
container: ubuntu:22.04
110115
install:
111116
- g++-12-multilib
112117
- name: 64-bit UBSAN
113118
toolset: gcc-12
114119
cxxstd: "03,11,14,17,20,23"
115120
address_model: "64"
116121
ubsan: 1
117-
os: ubuntu-22.04
122+
os: ubuntu-latest
123+
container: ubuntu:22.04
118124
install:
119125
- g++-12-multilib
120126

@@ -160,37 +166,43 @@ jobs:
160166
- toolset: clang
161167
compiler: clang++-11
162168
cxxstd: "03,11,14,17"
163-
os: ubuntu-22.04
169+
os: ubuntu-latest
170+
container: ubuntu:22.04
164171
install:
165172
- clang-11
166173
- toolset: clang
167174
compiler: clang++-12
168175
cxxstd: "03,11,14,17"
169-
os: ubuntu-22.04
176+
os: ubuntu-latest
177+
container: ubuntu:22.04
170178
install:
171179
- clang-12
172180
- toolset: clang
173181
compiler: clang++-13
174182
cxxstd: "03,11,14,17"
175-
os: ubuntu-22.04
183+
os: ubuntu-latest
184+
container: ubuntu:22.04
176185
install:
177186
- clang-13
178187
- toolset: clang
179188
compiler: clang++-14
180189
cxxstd: "03,11,14,17"
181-
os: ubuntu-22.04
190+
os: ubuntu-latest
191+
container: ubuntu:22.04
182192
install:
183193
- clang-14
184194
- toolset: clang
185195
compiler: clang++-14
186196
cxxstd: "03-gnu,11-gnu,14-gnu,17-gnu"
187-
os: ubuntu-22.04
197+
os: ubuntu-latest
198+
container: ubuntu:22.04
188199
install:
189200
- clang-14
190201
- toolset: clang
191202
compiler: clang++-15
192203
cxxstd: "03,11,14,17,20"
193-
os: ubuntu-22.04
204+
os: ubuntu-latest
205+
container: ubuntu:22.04
194206
install:
195207
- clang-15
196208
sources:
@@ -200,7 +212,8 @@ jobs:
200212
- toolset: clang
201213
compiler: clang++-15
202214
cxxstd: "03,11,14,17,20,2b"
203-
os: ubuntu-22.04
215+
os: ubuntu-latest
216+
container: ubuntu:22.04
204217
install:
205218
- clang-15
206219
- libc++-15-dev
@@ -214,7 +227,8 @@ jobs:
214227
- toolset: clang
215228
compiler: clang++-16
216229
cxxstd: "03,11,14,17,20,2b"
217-
os: ubuntu-22.04
230+
os: ubuntu-latest
231+
container: ubuntu:22.04
218232
install:
219233
- clang-16
220234
sources:
@@ -224,7 +238,8 @@ jobs:
224238
- toolset: clang
225239
compiler: clang++-17
226240
cxxstd: "03,11,14,17,20,2b"
227-
os: ubuntu-22.04
241+
os: ubuntu-latest
242+
container: ubuntu:22.04
228243
install:
229244
- clang-17
230245
sources:
@@ -476,34 +491,26 @@ jobs:
476491
fail-fast: false
477492
matrix:
478493
include:
479-
- toolset: msvc-14.2
480-
cxxstd: "14,17,20,latest"
481-
addrmd: "32"
482-
os: windows-2019
483494
- toolset: msvc-14.3
484495
cxxstd: "14,17,20,latest"
485496
addrmd: "32"
486497
os: windows-2022
487-
- toolset: msvc-14.2
488-
cxxstd: "14,17,20,latest"
489-
addrmd: "64"
490-
os: windows-2019
491498
- toolset: msvc-14.3
492499
cxxstd: "14,17,20,latest"
493500
addrmd: "64"
494501
os: windows-2022
495502
- toolset: clang-win
496503
cxxstd: "14,17,latest"
497504
addrmd: "32"
498-
os: windows-2022
505+
os: windows-latest
499506
- toolset: clang-win
500507
cxxstd: "14,17,latest"
501508
addrmd: "64"
502-
os: windows-2022
509+
os: windows-latest
503510
- toolset: gcc
504-
cxxstd: "03,11,14,17,2a"
511+
cxxstd: "03,11,14,17" # 20 has ICE
505512
addrmd: "64"
506-
os: windows-2019
513+
os: windows-latest
507514

508515
runs-on: ${{matrix.os}}
509516

@@ -543,7 +550,6 @@ jobs:
543550
fail-fast: false
544551
matrix:
545552
include:
546-
- os: ubuntu-22.04
547553
- os: ubuntu-24.04
548554
- os: macos-13
549555
- os: macos-14
@@ -592,7 +598,6 @@ jobs:
592598
fail-fast: false
593599
matrix:
594600
include:
595-
- os: ubuntu-22.04
596601
- os: ubuntu-24.04
597602
- os: macos-13
598603
- os: macos-14
@@ -651,8 +656,7 @@ jobs:
651656
fail-fast: false
652657
matrix:
653658
include:
654-
- os: ubuntu-20.04
655-
- os: ubuntu-22.04
659+
- os: ubuntu-24.04
656660
- os: macos-13
657661
- os: macos-14
658662
- os: macos-15

‎test/test_assoc_legendre.cpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
2323
# pragma GCC diagnostic ignored "-Wfloat-equal"
2424
#endif
2525

26+
// Windows in Github actions has a broken chrono header
27+
#if defined(_WIN32)
28+
29+
int main()
30+
{
31+
return 0;
32+
}
33+
34+
#else
35+
2636
#include <boost/math/special_functions/next.hpp>
2737
#include <boost/math/special_functions/legendre.hpp>
2838
#include <boost/core/lightweight_test.hpp>
@@ -233,3 +243,5 @@ int main()
233243

234244
return boost::report_errors();
235245
}
246+
247+
#endif

‎test/test_zeta.cpp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,15 @@
2424
# pragma GCC diagnostic ignored "-Wfloat-equal"
2525
#endif
2626

27-
#include <boost/decimal.hpp>
27+
// Windows in Github actions has a broken chrono header
28+
#if defined(_WIN32)
29+
30+
int main()
31+
{
32+
return 0;
33+
}
34+
35+
#else
2836

2937
#include <boost/core/lightweight_test.hpp>
3038
#include <boost/math/special_functions/zeta.hpp>
@@ -441,3 +449,5 @@ int main()
441449
template<typename DecimalType> auto my_zero() -> DecimalType& { using decimal_type = DecimalType; static decimal_type val_zero { 0 }; return val_zero; }
442450
template<typename DecimalType> auto my_nan () -> DecimalType& { using decimal_type = DecimalType; static decimal_type val_nan { std::numeric_limits<decimal_type>::quiet_NaN() }; return val_nan; }
443451
template<typename DecimalType> auto my_inf () -> DecimalType& { using decimal_type = DecimalType; static decimal_type val_inf { std::numeric_limits<decimal_type>::infinity() }; return val_inf; }
452+
453+
#endif

0 commit comments

Comments
 (0)