Skip to content

Commit d547322

Browse files
committed
Update ci.yml
1 parent 3b7b68b commit d547322

File tree

1 file changed

+40
-29
lines changed

1 file changed

+40
-29
lines changed

.github/workflows/ci.yml

Lines changed: 40 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,20 @@ jobs:
4949
address-model: 32,64
5050
- toolset: gcc-7
5151
cxxstd: "11,14,17"
52-
os: ubuntu-20.04
52+
os: ubuntu-latest
53+
container: ubuntu:20.04
5354
install: g++-7-multilib
5455
address-model: 32,64
5556
- toolset: gcc-8
5657
cxxstd: "11,14,17,2a"
57-
os: ubuntu-20.04
58+
os: ubuntu-latest
59+
container: ubuntu:20.04
5860
install: g++-8-multilib
5961
address-model: 32,64
6062
- toolset: gcc-9
6163
cxxstd: "11,14,17,2a"
62-
os: ubuntu-20.04
64+
os: ubuntu-latest
65+
container: ubuntu:20.04
6366
install: g++-9-multilib
6467
address-model: 32,64
6568
- toolset: gcc-10
@@ -89,6 +92,12 @@ jobs:
8992
container: ubuntu:24.04
9093
install: g++-14-multilib
9194
address-model: 32,64
95+
- toolset: gcc-15
96+
cxxstd: "11,14,17,20,23,2c"
97+
os: ubuntu-latest
98+
container: ubuntu:25.04
99+
install: g++-15-multilib
100+
address-model: 32,64
92101
- toolset: clang
93102
compiler: clang++-3.9
94103
cxxstd: "11,14"
@@ -110,35 +119,45 @@ jobs:
110119
- toolset: clang
111120
compiler: clang++-6.0
112121
cxxstd: "11,14,17"
113-
os: ubuntu-20.04
122+
os: ubuntu-latest
123+
container: ubuntu:20.04
114124
install: clang-6.0
115125
- toolset: clang
116126
compiler: clang++-7
117127
cxxstd: "11,14,17"
118-
os: ubuntu-20.04
128+
os: ubuntu-latest
129+
container: ubuntu:20.04
119130
install: clang-7
120131
- toolset: clang
121132
compiler: clang++-8
122133
cxxstd: "11,14,17"
123-
os: ubuntu-20.04
134+
os: ubuntu-latest
135+
container: ubuntu:20.04
124136
install: clang-8
125137
- toolset: clang
126138
compiler: clang++-9
127139
cxxstd: "11,14,17,2a"
128-
os: ubuntu-20.04
140+
os: ubuntu-latest
141+
container: ubuntu:20.04
129142
install: clang-9
130143
- toolset: clang
131144
compiler: clang++-10
132145
cxxstd: "11,14,17,2a"
133-
os: ubuntu-20.04
146+
os: ubuntu-latest
147+
container: ubuntu:20.04
148+
install: clang-10
134149
- toolset: clang
135150
compiler: clang++-11
136151
cxxstd: "11,14,17,2a"
137-
os: ubuntu-20.04
152+
os: ubuntu-latest
153+
container: ubuntu:20.04
154+
install: clang-11
138155
- toolset: clang
139156
compiler: clang++-12
140157
cxxstd: "11,14,17,20"
141-
os: ubuntu-20.04
158+
os: ubuntu-latest
159+
container: ubuntu:20.04
160+
install: clang-12
142161
- toolset: clang
143162
compiler: clang++-13
144163
cxxstd: "11,14,17,20,2b"
@@ -179,8 +198,14 @@ jobs:
179198
compiler: clang++-19
180199
cxxstd: "11,14,17,20,2b"
181200
os: ubuntu-latest
182-
container: ubuntu:24.10
201+
container: ubuntu:24.04
183202
install: clang-19
203+
- toolset: clang
204+
compiler: clang++-20
205+
cxxstd: "11,14,17,20,23,2c"
206+
os: ubuntu-latest
207+
container: ubuntu:25.04
208+
install: clang-20
184209
- toolset: clang
185210
cxxstd: "11,14,17,20,2b"
186211
os: macos-13
@@ -263,14 +288,6 @@ jobs:
263288
fail-fast: false
264289
matrix:
265290
include:
266-
- toolset: msvc-14.0
267-
cxxstd: 14,latest
268-
addrmd: 32,64
269-
os: windows-2019
270-
- toolset: msvc-14.2
271-
cxxstd: "14,17,20,latest"
272-
addrmd: 32,64
273-
os: windows-2019
274291
- toolset: msvc-14.3
275292
cxxstd: "14,17,20,latest"
276293
addrmd: 32,64
@@ -282,7 +299,7 @@ jobs:
282299
- toolset: gcc
283300
cxxstd: "11,14,17,2a"
284301
addrmd: 64
285-
os: windows-2019
302+
os: windows-2022
286303

287304
runs-on: ${{matrix.os}}
288305

@@ -322,7 +339,6 @@ jobs:
322339
fail-fast: false
323340
matrix:
324341
include:
325-
- os: ubuntu-20.04
326342
- os: ubuntu-22.04
327343
- os: ubuntu-24.04
328344
- os: macos-13
@@ -371,7 +387,6 @@ jobs:
371387
fail-fast: false
372388
matrix:
373389
include:
374-
- os: ubuntu-20.04
375390
- os: ubuntu-22.04
376391
- os: ubuntu-24.04
377392
- os: macos-13
@@ -430,7 +445,6 @@ jobs:
430445
fail-fast: false
431446
matrix:
432447
include:
433-
- os: ubuntu-20.04
434448
- os: ubuntu-22.04
435449
- os: ubuntu-24.04
436450
- os: macos-13
@@ -487,8 +501,7 @@ jobs:
487501
fail-fast: false
488502
matrix:
489503
include:
490-
- os: windows-2019
491-
- os: windows-2022
504+
- os: windows-latest
492505

493506
runs-on: ${{matrix.os}}
494507

@@ -536,8 +549,7 @@ jobs:
536549
fail-fast: false
537550
matrix:
538551
include:
539-
- os: windows-2019
540-
- os: windows-2022
552+
- os: windows-latest
541553

542554
runs-on: ${{matrix.os}}
543555

@@ -603,8 +615,7 @@ jobs:
603615
fail-fast: false
604616
matrix:
605617
include:
606-
- os: windows-2019
607-
- os: windows-2022
618+
- os: windows-latest
608619

609620
runs-on: ${{matrix.os}}
610621

0 commit comments

Comments
 (0)