Skip to content

Commit 8e24464

Browse files
committed
Sync from upstream.
2 parents 7e792bb + 593ddc7 commit 8e24464

File tree

2 files changed

+51
-25
lines changed

2 files changed

+51
-25
lines changed

.github/workflows/ci.yml

Lines changed: 50 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,14 @@ jobs:
5656
install: g++-12
5757
- toolset: gcc-13
5858
cxxstd: "11,14,17,20,2b"
59-
container: ubuntu:23.04
59+
container: ubuntu:24.04
6060
os: ubuntu-latest
6161
install: g++-13
62+
- toolset: gcc-14
63+
cxxstd: "11,14,17,20,2b"
64+
container: ubuntu:24.04
65+
os: ubuntu-latest
66+
install: g++-14
6267
- toolset: clang
6368
compiler: clang++-3.9
6469
cxxstd: "11,14"
@@ -133,40 +138,58 @@ jobs:
133138
- toolset: clang
134139
compiler: clang++-16
135140
cxxstd: "11,14,17,20,2b"
136-
container: ubuntu:23.04
141+
container: ubuntu:24.04
137142
os: ubuntu-latest
138143
install: clang-16
139144
- toolset: clang
140145
compiler: clang++-17
141146
cxxstd: "11,14,17,20,2b"
142-
container: ubuntu:23.10
147+
container: ubuntu:24.04
143148
os: ubuntu-latest
144149
install: clang-17
145150
- toolset: clang
146-
cxxstd: "11,14,17,2a"
147-
os: macos-11
148-
- toolset: clang
151+
compiler: clang++-18
149152
cxxstd: "11,14,17,20,2b"
150-
os: macos-12
153+
container: ubuntu:24.04
154+
os: ubuntu-latest
155+
install: clang-18
151156
- toolset: clang
152157
cxxstd: "11,14,17,20,2b"
153158
os: macos-13
159+
- toolset: clang
160+
cxxstd: "11,14,17,20,2b"
161+
os: macos-14
162+
- toolset: clang
163+
cxxstd: "11,14,17,20,2b"
164+
os: macos-15
154165

155166
runs-on: ${{matrix.os}}
156-
container: ${{matrix.container}}
167+
168+
container:
169+
image: ${{matrix.container}}
170+
volumes:
171+
- /node20217:/node20217:rw,rshared
172+
- ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}
157173

158174
defaults:
159175
run:
160176
shell: bash
161177

162178
steps:
163-
- uses: actions/checkout@v3
164-
165179
- name: Setup container environment
166180
if: matrix.container
167181
run: |
168182
apt-get update
169-
apt-get -y install sudo python3 git g++
183+
apt-get -y install sudo python3 git g++ curl xz-utils
184+
185+
- name: Install nodejs20glibc2.17
186+
if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
187+
run: |
188+
curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz
189+
tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
190+
ldd /__e/node20/bin/node
191+
192+
- uses: actions/checkout@v4
170193

171194
- name: Install packages
172195
if: matrix.install
@@ -236,7 +259,7 @@ jobs:
236259
runs-on: ${{matrix.os}}
237260

238261
steps:
239-
- uses: actions/checkout@v3
262+
- uses: actions/checkout@v4
240263

241264
- name: Setup Boost
242265
shell: cmd
@@ -273,14 +296,15 @@ jobs:
273296
include:
274297
- os: ubuntu-20.04
275298
- os: ubuntu-22.04
276-
- os: macos-11
277-
- os: macos-12
299+
- os: ubuntu-24.04
278300
- os: macos-13
301+
- os: macos-14
302+
- os: macos-15
279303

280304
runs-on: ${{matrix.os}}
281305

282306
steps:
283-
- uses: actions/checkout@v3
307+
- uses: actions/checkout@v4
284308

285309
- name: Install packages
286310
if: matrix.install
@@ -321,14 +345,15 @@ jobs:
321345
include:
322346
- os: ubuntu-20.04
323347
- os: ubuntu-22.04
324-
- os: macos-11
325-
- os: macos-12
348+
- os: ubuntu-24.04
326349
- os: macos-13
350+
- os: macos-14
351+
- os: macos-15
327352

328353
runs-on: ${{matrix.os}}
329354

330355
steps:
331-
- uses: actions/checkout@v3
356+
- uses: actions/checkout@v4
332357

333358
- name: Install packages
334359
if: matrix.install
@@ -379,14 +404,15 @@ jobs:
379404
include:
380405
- os: ubuntu-20.04
381406
- os: ubuntu-22.04
382-
- os: macos-11
383-
- os: macos-12
407+
- os: ubuntu-24.04
384408
- os: macos-13
409+
- os: macos-14
410+
- os: macos-15
385411

386412
runs-on: ${{matrix.os}}
387413

388414
steps:
389-
- uses: actions/checkout@v3
415+
- uses: actions/checkout@v4
390416

391417
- name: Install packages
392418
if: matrix.install
@@ -439,7 +465,7 @@ jobs:
439465
runs-on: ${{matrix.os}}
440466

441467
steps:
442-
- uses: actions/checkout@v3
468+
- uses: actions/checkout@v4
443469

444470
- name: Setup Boost
445471
shell: cmd
@@ -488,7 +514,7 @@ jobs:
488514
runs-on: ${{matrix.os}}
489515

490516
steps:
491-
- uses: actions/checkout@v3
517+
- uses: actions/checkout@v4
492518

493519
- name: Setup Boost
494520
shell: cmd
@@ -555,7 +581,7 @@ jobs:
555581
runs-on: ${{matrix.os}}
556582

557583
steps:
558-
- uses: actions/checkout@v3
584+
- uses: actions/checkout@v4
559585

560586
- name: Setup Boost
561587
shell: cmd

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
66

77
if(HAVE_BOOST_TEST)
88

9-
boost_test_jamfile(FILE Jamfile LINK_LIBRARIES Boost::lambda Boost::core Boost::any Boost::function)
9+
boost_test_jamfile(FILE Jamfile LINK_LIBRARIES Boost::lambda Boost::core Boost::any Boost::function Boost::smart_ptr)
1010

1111
endif()

0 commit comments

Comments
 (0)