Skip to content

Commit e2e608b

Browse files
committed
Update ci.yml
1 parent f87addc commit e2e608b

1 file changed

Lines changed: 61 additions & 53 deletions

File tree

.github/workflows/ci.yml

Lines changed: 61 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,6 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
include:
20-
- toolset: gcc-4.8
21-
cxxstd: "11"
22-
container: ubuntu:18.04
23-
os: ubuntu-latest
24-
install: g++-4.8
25-
- toolset: gcc-5
26-
cxxstd: "11,14,1z"
27-
container: ubuntu:18.04
28-
os: ubuntu-latest
29-
install: g++-5
30-
- toolset: gcc-6
31-
cxxstd: "11,14,1z"
32-
container: ubuntu:18.04
33-
os: ubuntu-latest
34-
install: g++-6
3520
- toolset: gcc-7
3621
cxxstd: "11,14,17"
3722
container: ubuntu:20.04
@@ -53,10 +38,12 @@ jobs:
5338
install: g++-10
5439
- toolset: gcc-11
5540
cxxstd: "11,14,17,2a"
56-
os: ubuntu-22.04
41+
container: ubuntu:22.04
42+
os: ubuntu-latest
5743
- toolset: gcc-12
5844
cxxstd: "11,14,17,20,2b"
59-
os: ubuntu-22.04
45+
container: ubuntu:22.04
46+
os: ubuntu-latest
6047
install: g++-12
6148
- toolset: gcc-13
6249
cxxstd: "11,14,17,20,2b"
@@ -68,24 +55,16 @@ jobs:
6855
container: ubuntu:24.04
6956
os: ubuntu-latest
7057
install: g++-14
71-
- toolset: clang
72-
compiler: clang++-3.9
73-
cxxstd: "11,14"
74-
container: ubuntu:18.04
75-
os: ubuntu-latest
76-
install: clang-3.9
77-
- toolset: clang
78-
compiler: clang++-4.0
79-
cxxstd: "11,14"
80-
container: ubuntu:18.04
58+
- toolset: gcc-15
59+
cxxstd: "11,14,17,20,23,2c"
60+
container: ubuntu:26.04
8161
os: ubuntu-latest
82-
install: clang-4.0
83-
- toolset: clang
84-
compiler: clang++-5.0
85-
cxxstd: "11,14,1z"
86-
container: ubuntu:18.04
62+
install: g++-15
63+
- toolset: gcc-16
64+
cxxstd: "11,14,17,20,23,2c"
65+
container: ubuntu:26.04
8766
os: ubuntu-latest
88-
install: clang-5.0
67+
install: g++-16
8968
- toolset: clang
9069
compiler: clang++-6.0
9170
cxxstd: "11,14,17"
@@ -176,6 +155,18 @@ jobs:
176155
container: ubuntu:24.04
177156
os: ubuntu-latest
178157
install: clang-20
158+
- toolset: clang
159+
compiler: clang++-21
160+
cxxstd: "11,14,17,20,23,2c"
161+
container: ubuntu:26.04
162+
os: ubuntu-latest
163+
install: clang-21
164+
- toolset: clang
165+
compiler: clang++-22
166+
cxxstd: "11,14,17,20,23,2c"
167+
container: ubuntu:26.04
168+
os: ubuntu-latest
169+
install: clang-22
179170
- toolset: clang
180171
os: macos-14
181172
cxxstd: "11,14,17,20,2b"
@@ -187,12 +178,7 @@ jobs:
187178
cxxstd: "11,14,17,20,23,2c"
188179

189180
runs-on: ${{matrix.os}}
190-
191-
container:
192-
image: ${{matrix.container}}
193-
volumes:
194-
- /node20217:/node20217:rw,rshared
195-
- ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}
181+
container: ${{matrix.container}}
196182

197183
defaults:
198184
run:
@@ -205,14 +191,7 @@ jobs:
205191
apt-get update
206192
apt-get -y install sudo python3 git g++ curl xz-utils
207193
208-
- name: Install nodejs20glibc2.17
209-
if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
210-
run: |
211-
curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz
212-
tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
213-
ldd /__e/node20/bin/node
214-
215-
- uses: actions/checkout@v4
194+
- uses: actions/checkout@v6
216195

217196
- name: Install packages
218197
if: matrix.install
@@ -270,7 +249,7 @@ jobs:
270249
runs-on: ${{matrix.os}}
271250

272251
steps:
273-
- uses: actions/checkout@v3
252+
- uses: actions/checkout@v6
274253

275254
- name: Setup Boost
276255
shell: cmd
@@ -302,7 +281,7 @@ jobs:
302281
runs-on: ubuntu-latest
303282

304283
steps:
305-
- uses: actions/checkout@v3
284+
- uses: actions/checkout@v6
306285

307286
- name: Setup Boost
308287
run: |
@@ -332,23 +311,52 @@ jobs:
332311
runs-on: ubuntu-latest
333312

334313
steps:
335-
- uses: actions/checkout@v3
314+
- uses: actions/checkout@v6
336315

337316
- name: Install packages
338317
run: sudo apt-get install libboost-filesystem-dev
339318

340319
- name: Build Boostdep with CMake
341320
run: |
342321
mkdir __build__ && cd __build__
343-
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=~ ..
322+
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=~/.local ..
344323
cmake --build . --target install
345324
325+
windows-cmake:
326+
327+
runs-on: windows-latest
328+
329+
steps:
330+
- uses: actions/checkout@v6
331+
332+
- name: Install Boost
333+
shell: cmd
334+
run: |
335+
echo GITHUB_REPOSITORY: %GITHUB_REPOSITORY%
336+
echo GITHUB_BASE_REF: %GITHUB_BASE_REF%
337+
echo GITHUB_REF: %GITHUB_REF%
338+
if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF%
339+
set BOOST_BRANCH=develop
340+
for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master
341+
echo BOOST_BRANCH: %BOOST_BRANCH%
342+
cd ..
343+
git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
344+
cd boost-root
345+
python %GITHUB_WORKSPACE%/depinst/depinst.py -u --git_args "--jobs 3" filesystem
346+
cmd /c bootstrap
347+
b2 --with-filesystem install
348+
349+
- name: Build Boostdep with CMake
350+
run: |
351+
cmake -S . -B __build__ -DBoost_ROOT=C:/Boost -DCMAKE_INSTALL_PREFIX=C:/boostdep ..
352+
cmake --build __build__ --target install --config Release
353+
346354
posix-check-exceptions:
347355

348356
runs-on: ubuntu-latest
349357

350358
steps:
351-
- uses: actions/checkout@v3
359+
- uses: actions/checkout@v6
352360

353361
- name: Setup Boost
354362
run: |
@@ -402,7 +410,7 @@ jobs:
402410
runs-on: ubuntu-latest
403411

404412
steps:
405-
- uses: actions/checkout@v4
413+
- uses: actions/checkout@v6
406414

407415
- name: Setup Boost
408416
run: |

0 commit comments

Comments
 (0)