Skip to content

Commit 74bea78

Browse files
committed
Update ci.yml
1 parent 52f1ba6 commit 74bea78

1 file changed

Lines changed: 35 additions & 31 deletions

File tree

.github/workflows/ci.yml

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,26 @@ jobs:
3838
os: ubuntu-latest
3939
- toolset: gcc-8
4040
cxxstd: "03,11,14,17,2a"
41-
os: ubuntu-20.04
41+
container: ubuntu:20.04
42+
os: ubuntu-latest
4243
install: g++-8
4344
- toolset: gcc-9
4445
cxxstd: "03,11,14,17,2a"
45-
os: ubuntu-20.04
46+
container: ubuntu:20.04
47+
os: ubuntu-latest
4648
- toolset: gcc-10
4749
cxxstd: "03,11,14,17,2a"
48-
os: ubuntu-20.04
50+
container: ubuntu:20.04
51+
os: ubuntu-latest
4952
install: g++-10
5053
- toolset: gcc-11
5154
cxxstd: "03,11,14,17,2a"
52-
os: ubuntu-22.04
55+
container: ubuntu:22.04
56+
os: ubuntu-latest
5357
- toolset: gcc-12
5458
cxxstd: "03,11,14,17,20,2b"
55-
os: ubuntu-22.04
59+
container: ubuntu:22.04
60+
os: ubuntu-latest
5661
install: g++-12
5762
- toolset: gcc-13
5863
cxxstd: "03,11,14,17,20,2b"
@@ -85,37 +90,44 @@ jobs:
8590
- toolset: clang
8691
compiler: clang++-6.0
8792
cxxstd: "03,11,14,17"
88-
os: ubuntu-20.04
93+
container: ubuntu:20.04
94+
os: ubuntu-latest
8995
install: clang-6.0
9096
- toolset: clang
9197
compiler: clang++-7
9298
cxxstd: "03,11,14,17"
93-
os: ubuntu-20.04
99+
container: ubuntu:20.04
100+
os: ubuntu-latest
94101
install: clang-7
95102
- toolset: clang
96103
compiler: clang++-8
97104
cxxstd: "03,11,14,17"
98-
os: ubuntu-20.04
105+
container: ubuntu:20.04
106+
os: ubuntu-latest
99107
install: clang-8
100108
- toolset: clang
101109
compiler: clang++-9
102110
cxxstd: "03,11,14,17,2a"
103-
os: ubuntu-20.04
111+
container: ubuntu:20.04
112+
os: ubuntu-latest
104113
install: clang-9
105114
- toolset: clang
106115
compiler: clang++-10
107116
cxxstd: "03,11,14,17,2a"
108-
os: ubuntu-20.04
117+
container: ubuntu:20.04
118+
os: ubuntu-latest
109119
install: clang-10
110120
- toolset: clang
111121
compiler: clang++-11
112122
cxxstd: "03,11,14,17,2a"
113-
os: ubuntu-20.04
123+
container: ubuntu:20.04
124+
os: ubuntu-latest
114125
install: clang-11
115126
- toolset: clang
116127
compiler: clang++-12
117128
cxxstd: "03,11,14,17,2a"
118-
os: ubuntu-20.04
129+
container: ubuntu:20.04
130+
os: ubuntu-latest
119131
install: clang-12
120132
- toolset: clang
121133
compiler: clang++-13
@@ -156,9 +168,15 @@ jobs:
156168
- toolset: clang
157169
compiler: clang++-19
158170
cxxstd: "03,11,14,17,20,2b"
159-
container: ubuntu:24.10
171+
container: ubuntu:24.04
160172
os: ubuntu-latest
161173
install: clang-19
174+
- toolset: clang
175+
compiler: clang++-20
176+
cxxstd: "03,11,14,17,20,2b"
177+
container: ubuntu:24.04
178+
os: ubuntu-latest
179+
install: clang-20
162180
- toolset: clang
163181
cxxstd: "03,11,14,17,20,2b"
164182
os: macos-13
@@ -240,14 +258,6 @@ jobs:
240258
fail-fast: false
241259
matrix:
242260
include:
243-
- toolset: msvc-14.0
244-
cxxstd: "14,latest"
245-
addrmd: 32,64
246-
os: windows-2019
247-
- toolset: msvc-14.2
248-
cxxstd: "14,17,20,latest"
249-
addrmd: 32,64
250-
os: windows-2019
251261
- toolset: msvc-14.3
252262
cxxstd: "14,17,20,latest"
253263
addrmd: 32,64
@@ -259,7 +269,7 @@ jobs:
259269
- toolset: gcc
260270
cxxstd: "03,11,14,17,2a"
261271
addrmd: 64
262-
os: windows-2019
272+
os: windows-2022
263273

264274
runs-on: ${{matrix.os}}
265275

@@ -299,7 +309,6 @@ jobs:
299309
fail-fast: false
300310
matrix:
301311
include:
302-
- os: ubuntu-20.04
303312
- os: ubuntu-22.04
304313
- os: ubuntu-24.04
305314
- os: macos-13
@@ -348,7 +357,6 @@ jobs:
348357
fail-fast: false
349358
matrix:
350359
include:
351-
- os: ubuntu-20.04
352360
- os: ubuntu-22.04
353361
- os: ubuntu-24.04
354362
- os: macos-13
@@ -407,7 +415,6 @@ jobs:
407415
fail-fast: false
408416
matrix:
409417
include:
410-
- os: ubuntu-20.04
411418
- os: ubuntu-22.04
412419
- os: ubuntu-24.04
413420
- os: macos-13
@@ -464,8 +471,7 @@ jobs:
464471
fail-fast: false
465472
matrix:
466473
include:
467-
- os: windows-2019
468-
- os: windows-2022
474+
- os: windows-latest
469475

470476
runs-on: ${{matrix.os}}
471477

@@ -513,8 +519,7 @@ jobs:
513519
fail-fast: false
514520
matrix:
515521
include:
516-
- os: windows-2019
517-
- os: windows-2022
522+
- os: windows-latest
518523

519524
runs-on: ${{matrix.os}}
520525

@@ -580,8 +585,7 @@ jobs:
580585
fail-fast: false
581586
matrix:
582587
include:
583-
- os: windows-2019
584-
- os: windows-2022
588+
- os: windows-latest
585589

586590
runs-on: ${{matrix.os}}
587591

0 commit comments

Comments
 (0)