Skip to content

Commit 6d5728a

Browse files
committed
Update ci.yml
1 parent 1e0574b commit 6d5728a

1 file changed

Lines changed: 46 additions & 55 deletions

File tree

.github/workflows/ci.yml

Lines changed: 46 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,14 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
include:
20-
- toolset: gcc-4.8
21-
container: ubuntu:18.04
22-
os: ubuntu-latest
23-
install: g++-4.8
24-
- toolset: gcc-5
25-
container: ubuntu:18.04
26-
os: ubuntu-latest
27-
install: g++-5
28-
- toolset: gcc-6
29-
container: ubuntu:18.04
30-
os: ubuntu-latest
31-
install: g++-6
3220
- toolset: gcc-7
3321
container: ubuntu:20.04
3422
os: ubuntu-latest
3523
install: g++-7
36-
# gcc-8 variant=release crashes
37-
# - toolset: gcc-8
38-
# os: ubuntu-20.04
39-
# install: g++-8
24+
- toolset: gcc-8
25+
container: ubuntu:20.04
26+
os: ubuntu-latest
27+
install: g++-8
4028
- toolset: gcc-9
4129
container: ubuntu:20.04
4230
os: ubuntu-latest
@@ -45,10 +33,12 @@ jobs:
4533
os: ubuntu-latest
4634
install: g++-10
4735
- toolset: gcc-11
48-
os: ubuntu-22.04
36+
container: ubuntu:22.04
37+
os: ubuntu-latest
4938
install: g++-11
5039
- toolset: gcc-12
51-
os: ubuntu-22.04
40+
container: ubuntu:22.04
41+
os: ubuntu-latest
5242
install: g++-12
5343
- toolset: gcc-13
5444
container: ubuntu:24.04
@@ -58,21 +48,14 @@ jobs:
5848
container: ubuntu:24.04
5949
os: ubuntu-latest
6050
install: g++-14
61-
- toolset: clang
62-
compiler: clang++-3.9
63-
container: ubuntu:18.04
64-
os: ubuntu-latest
65-
install: clang-3.9
66-
- toolset: clang
67-
compiler: clang++-4.0
68-
container: ubuntu:18.04
51+
- toolset: gcc-15
52+
container: ubuntu:26.04
6953
os: ubuntu-latest
70-
install: clang-4.0
71-
- toolset: clang
72-
compiler: clang++-5.0
73-
container: ubuntu:18.04
54+
install: g++-15
55+
- toolset: gcc-16
56+
container: ubuntu:26.04
7457
os: ubuntu-latest
75-
install: clang-5.0
58+
install: g++-16
7659
- toolset: clang
7760
compiler: clang++-6.0
7861
container: ubuntu:20.04
@@ -110,15 +93,18 @@ jobs:
11093
install: clang-12
11194
- toolset: clang
11295
compiler: clang++-13
113-
os: ubuntu-22.04
96+
container: ubuntu:22.04
97+
os: ubuntu-latest
11498
install: clang-13
11599
- toolset: clang
116100
compiler: clang++-14
117-
os: ubuntu-22.04
101+
container: ubuntu:22.04
102+
os: ubuntu-latest
118103
install: clang-14
119104
- toolset: clang
120105
compiler: clang++-15
121-
os: ubuntu-22.04
106+
container: ubuntu:22.04
107+
os: ubuntu-latest
122108
install: clang-15
123109
- toolset: clang
124110
compiler: clang++-16
@@ -136,39 +122,46 @@ jobs:
136122
os: ubuntu-latest
137123
install: clang-18
138124
- toolset: clang
139-
os: macos-13
125+
compiler: clang++-19
126+
container: ubuntu:24.04
127+
os: ubuntu-latest
128+
install: clang-19
129+
- toolset: clang
130+
compiler: clang++-20
131+
container: ubuntu:24.04
132+
os: ubuntu-latest
133+
install: clang-20
134+
- toolset: clang
135+
compiler: clang++-21
136+
container: ubuntu:26.04
137+
os: ubuntu-latest
138+
install: clang-21
139+
- toolset: clang
140+
compiler: clang++-22
141+
container: ubuntu:26.04
142+
os: ubuntu-latest
143+
install: clang-22
140144
- toolset: clang
141145
os: macos-14
142146
- toolset: clang
143147
os: macos-15
148+
- toolset: clang
149+
os: macos-26
144150

145151
runs-on: ${{matrix.os}}
146-
container:
147-
image: ${{matrix.container}}
148-
volumes:
149-
- /node20217:/node20217:rw,rshared
150-
- ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}
151152

152153
defaults:
153154
run:
154155
shell: bash
155156

156-
157157
steps:
158158
- name: Setup container environment
159159
if: matrix.container
160160
run: |
161161
apt-get update
162162
apt-get -y install sudo python3 git g++ curl xz-utils
163163
164-
- name: Install nodejs20glibc2.17
165-
if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
166-
run: |
167-
curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz
168-
tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
169-
ldd /__e/node20/bin/node
170-
171-
- uses: actions/checkout@v3
164+
- uses: actions/checkout@v6
172165

173166
- name: Install packages
174167
if: matrix.install
@@ -210,20 +203,18 @@ jobs:
210203
fail-fast: false
211204
matrix:
212205
include:
213-
- toolset: msvc-14.0
214-
os: windows-2019
215-
- toolset: msvc-14.2
216-
os: windows-2019
217206
- toolset: msvc-14.3
218207
os: windows-2022
208+
- toolset: msvc-14.5
209+
os: windows-2025-vs2026
219210

220211
# The test Jamfile doesn't work with the clang-win toolset for some reason
221212
# - toolset: clang-win
222213
# os: windows-2022
223214

224215
# gcc-8 variant=release crashes
225-
# - toolset: gcc
226-
# os: windows-2019
216+
- toolset: gcc
217+
os: windows-2025
227218

228219
runs-on: ${{matrix.os}}
229220

0 commit comments

Comments
 (0)