Skip to content

Commit dd9ce1c

Browse files
authored
Merge pull request #778 from sdebionne/sde/fix-ci
Fix clang compilation in CI
2 parents d8c5635 + 82fb089 commit dd9ce1c

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
install: clang-4.0
8585
- toolset: clang
8686
compiler: clang++-5.0
87-
cxxstd: "14,1z"
87+
cxxstd: "14"
8888
os: ubuntu-latest
8989
container: ubuntu:18.04
9090
install: clang-5.0
@@ -171,8 +171,11 @@ jobs:
171171
container: ubuntu:25.04
172172
install: clang-20
173173
- toolset: clang
174-
cxxstd: "14,17"
175-
os: macos-13
174+
cxxstd: "14,17,20"
175+
os: macos-14
176+
- toolset: clang
177+
cxxstd: "14,17,20"
178+
os: macos-15
176179

177180
runs-on: ${{matrix.os}}
178181
container:

test/core/image/test_fixture.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@ using image_types = std::tuple
3535
gil::rgba32_image_t
3636
>;
3737

38-
#if defined(BOOST_NO_CXX17_HDR_MEMORY_RESOURCE)
38+
// Workaround until we have the proper defect test in Boost.Config
39+
#if defined(__APPLE__) && (__clang_major__ == 15)
40+
#define BOOST_NO_CXX17_DEFAULT_RESOURCE
41+
#endif
42+
43+
#if defined(BOOST_NO_CXX17_HDR_MEMORY_RESOURCE) || defined(BOOST_NO_CXX17_DEFAULT_RESOURCE)
3944
using pmr_image_types = std::tuple<>;
4045
#else
4146
using pmr_image_types = std::tuple

0 commit comments

Comments
 (0)