Skip to content

Commit 9dfab46

Browse files
committed
Move ubuntu 22.04 into containers and remove windows-2019
1 parent 222d6b2 commit 9dfab46

File tree

1 file changed

+22
-16
lines changed

1 file changed

+22
-16
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,22 @@ jobs:
9191
- toolset: gcc-11
9292
cxxstd: "11,14,17,20,23"
9393
address_model: 32,64
94-
os: ubuntu-22.04
94+
os: ubuntu-latest
95+
container: ubuntu:22.04
9596
install:
9697
- g++-11-multilib
9798
- toolset: gcc-12
9899
cxxstd: "11,14,17,20,23"
99100
address_model: 32,64
100-
os: ubuntu-22.04
101+
os: ubuntu-latest
102+
container: ubuntu:22.04
101103
install:
102104
- g++-12-multilib
103105
- toolset: gcc-12
104106
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu,23-gnu"
105107
address_model: 32,64
106-
os: ubuntu-22.04
108+
os: ubuntu-latest
109+
container: ubuntu:22.04
107110
install:
108111
- g++-12-multilib
109112

@@ -184,37 +187,43 @@ jobs:
184187
- toolset: clang
185188
compiler: clang++-11
186189
cxxstd: "11,14,17,20"
187-
os: ubuntu-22.04
190+
os: ubuntu-latest
191+
container: ubuntu:22.04
188192
install:
189193
- clang-11
190194
- toolset: clang
191195
compiler: clang++-12
192196
cxxstd: "11,14,17,20"
193-
os: ubuntu-22.04
197+
os: ubuntu-latest
198+
container: ubuntu:22.04
194199
install:
195200
- clang-12
196201
- toolset: clang
197202
compiler: clang++-13
198203
cxxstd: "11,14,17,20"
199-
os: ubuntu-22.04
204+
os: ubuntu-latest
205+
container: ubuntu:22.04
200206
install:
201207
- clang-13
202208
- toolset: clang
203209
compiler: clang++-14
204210
cxxstd: "11,14,17,20"
205-
os: ubuntu-22.04
211+
os: ubuntu-latest
212+
container: ubuntu:22.04
206213
install:
207214
- clang-14
208215
- toolset: clang
209216
compiler: clang++-14
210217
cxxstd: "11-gnu,14-gnu,17-gnu,20-gnu"
211-
os: ubuntu-22.04
218+
os: ubuntu-latest
219+
container: ubuntu:22.04
212220
install:
213221
- clang-14
214222
- toolset: clang
215223
compiler: clang++-15
216224
cxxstd: "11,14,17,20"
217-
os: ubuntu-22.04
225+
os: ubuntu-latest
226+
container: ubuntu:22.04
218227
install:
219228
- clang-15
220229
sources:
@@ -224,7 +233,8 @@ jobs:
224233
- toolset: clang
225234
compiler: clang++-15
226235
cxxstd: "11,14,17,20,2b"
227-
os: ubuntu-22.04
236+
os: ubuntu-latest
237+
container: ubuntu:22.04
228238
install:
229239
- clang-15
230240
- libc++-15-dev
@@ -455,10 +465,6 @@ jobs:
455465
fail-fast: false
456466
matrix:
457467
include:
458-
- toolset: msvc-14.2
459-
cxxstd: "14,17,latest"
460-
addrmd: 64
461-
os: windows-2019
462468
- toolset: msvc-14.3
463469
cxxstd: "17,20,latest"
464470
addrmd: 64
@@ -470,7 +476,7 @@ jobs:
470476
- toolset: gcc
471477
cxxstd: "11,14,17,2a"
472478
addrmd: 64
473-
os: windows-2019
479+
os: windows-latest
474480

475481
runs-on: ${{matrix.os}}
476482

@@ -510,10 +516,10 @@ jobs:
510516
fail-fast: false
511517
matrix:
512518
include:
513-
- os: ubuntu-22.04
514519
- os: ubuntu-24.04
515520
- os: macos-13
516521
- os: macos-14
522+
- os: macos-15
517523

518524
runs-on: ${{matrix.os}}
519525

0 commit comments

Comments
 (0)