Skip to content

Commit 10fcc7f

Browse files
authored
Align matrix with the latest ubuntu version (#290)
* Align matrix with the latest ubuntu version * Use clang-9 for iwyu (max version supported)
1 parent 1777284 commit 10fcc7f

File tree

1 file changed

+55
-28
lines changed

1 file changed

+55
-28
lines changed

.github/workflows/verify-build.yml

Lines changed: 55 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,48 +58,48 @@ jobs:
5858
os-type: ubuntu
5959
build-type: asan
6060
compiler-family: clang
61-
c-compiler: clang-6.0
62-
cc-compiler: clang++-6.0
61+
c-compiler: clang-13
62+
cc-compiler: clang++-13
6363
debug: debug
6464
coverage: nocoverage
6565
- test-group: extra
6666
os: ubuntu-latest
6767
os-type: ubuntu
6868
build-type: msan
6969
compiler-family: clang
70-
c-compiler: clang-6.0
71-
cc-compiler: clang++-6.0
70+
c-compiler: clang-13
71+
cc-compiler: clang++-13
7272
debug: debug
7373
coverage: nocoverage
7474
- test-group: extra
7575
os: ubuntu-latest
7676
os-type: ubuntu
7777
build-type: lsan
7878
compiler-family: clang
79-
c-compiler: clang-6.0
80-
cc-compiler: clang++-6.0
79+
c-compiler: clang-13
80+
cc-compiler: clang++-13
8181
debug: debug
8282
coverage: nocoverage
8383
- test-group: extra
8484
os: ubuntu-latest
8585
os-type: ubuntu
8686
build-type: tsan
8787
compiler-family: clang
88-
c-compiler: clang-6.0
89-
cc-compiler: clang++-6.0
88+
c-compiler: clang-13
89+
cc-compiler: clang++-13
9090
debug: debug
9191
coverage: nocoverage
9292
- test-group: extra
9393
os: ubuntu-latest
9494
os-type: ubuntu
9595
build-type: ubsan
9696
compiler-family: clang
97-
c-compiler: clang-6.0
98-
cc-compiler: clang++-6.0
97+
c-compiler: clang-13
98+
cc-compiler: clang++-13
9999
debug: debug
100100
coverage: nocoverage
101101
- test-group: extra
102-
os: ubuntu-latest
102+
os: ubuntu-20.04
103103
os-type: ubuntu
104104
build-type: none
105105
compiler-family: gcc
@@ -108,7 +108,7 @@ jobs:
108108
debug: nodebug
109109
coverage: nocoverage
110110
- test-group: extra
111-
os: ubuntu-latest
111+
os: ubuntu-20.04
112112
os-type: ubuntu
113113
build-type: none
114114
compiler-family: gcc
@@ -144,7 +144,7 @@ jobs:
144144
debug: nodebug
145145
coverage: nocoverage
146146
- test-group: extra
147-
os: ubuntu-latest
147+
os: ubuntu-20.04
148148
os-type: ubuntu
149149
build-type: none
150150
compiler-family: clang
@@ -153,7 +153,7 @@ jobs:
153153
debug: nodebug
154154
coverage: nocoverage
155155
- test-group: extra
156-
os: ubuntu-latest
156+
os: ubuntu-20.04
157157
os-type: ubuntu
158158
build-type: none
159159
compiler-family: clang
@@ -162,7 +162,7 @@ jobs:
162162
debug: nodebug
163163
coverage: nocoverage
164164
- test-group: extra
165-
os: ubuntu-latest
165+
os: ubuntu-20.04
166166
os-type: ubuntu
167167
build-type: none
168168
compiler-family: clang
@@ -171,7 +171,7 @@ jobs:
171171
debug: nodebug
172172
coverage: nocoverage
173173
- test-group: extra
174-
os: ubuntu-latest
174+
os: ubuntu-20.04
175175
os-type: ubuntu
176176
build-type: none
177177
compiler-family: clang
@@ -180,25 +180,52 @@ jobs:
180180
debug: nodebug
181181
coverage: nocoverage
182182
- test-group: extra
183-
os: ubuntu-latest
183+
os: ubuntu-20.04
184184
os-type: ubuntu
185185
build-type: none
186186
compiler-family: clang
187187
c-compiler: clang-10
188188
cc-compiler: clang++-10
189189
debug: nodebug
190190
coverage: nocoverage
191+
- test-group: extra
192+
os: ubuntu-latest
193+
os-type: ubuntu
194+
build-type: none
195+
compiler-family: clang
196+
c-compiler: clang-11
197+
cc-compiler: clang++-11
198+
debug: nodebug
199+
coverage: nocoverage
200+
- test-group: extra
201+
os: ubuntu-latest
202+
os-type: ubuntu
203+
build-type: none
204+
compiler-family: clang
205+
c-compiler: clang-12
206+
cc-compiler: clang++-12
207+
debug: nodebug
208+
coverage: nocoverage
209+
- test-group: extra
210+
os: ubuntu-latest
211+
os-type: ubuntu
212+
build-type: none
213+
compiler-family: clang
214+
c-compiler: clang-13
215+
cc-compiler: clang++-13
216+
debug: nodebug
217+
coverage: nocoverage
191218
- test-group: extra
192219
os: ubuntu-latest
193220
os-type: ubuntu
194221
build-type: valgrind
195222
compiler-family: gcc
196-
c-compiler: gcc-7
197-
cc-compiler: g++-7
223+
c-compiler: gcc-10
224+
cc-compiler: g++-10
198225
debug: nodebug
199226
coverage: nocoverage
200227
- test-group: extra
201-
os: ubuntu-latest
228+
os: ubuntu-20.04
202229
os-type: ubuntu
203230
build-type: iwyu
204231
compiler-family: clang
@@ -211,35 +238,35 @@ jobs:
211238
os-type: ubuntu
212239
build-type: select
213240
compiler-family: gcc
214-
c-compiler: gcc-7
215-
cc-compiler: g++-7
241+
c-compiler: gcc-10
242+
cc-compiler: g++-10
216243
debug: nodebug
217244
coverage: nocoverage
218245
- test-group: performance
219246
os: ubuntu-latest
220247
os-type: ubuntu
221248
build-type: nodelay
222249
compiler-family: gcc
223-
c-compiler: gcc-7
224-
cc-compiler: g++-7
250+
c-compiler: gcc-10
251+
cc-compiler: g++-10
225252
debug: nodebug
226253
coverage: nocoverage
227254
- test-group: performance
228255
os: ubuntu-latest
229256
os-type: ubuntu
230257
build-type: threads
231258
compiler-family: gcc
232-
c-compiler: gcc-7
233-
cc-compiler: g++-7
259+
c-compiler: gcc-10
260+
cc-compiler: g++-10
234261
debug: nodebug
235262
coverage: nocoverage
236263
- test-group: extra
237264
os: ubuntu-latest
238265
os-type: ubuntu
239266
build-type: lint
240267
compiler-family: gcc
241-
c-compiler: gcc-7
242-
cc-compiler: g++-7
268+
c-compiler: gcc-10
269+
cc-compiler: g++-10
243270
debug: debug
244271
coverage: nocoverage
245272
steps:

0 commit comments

Comments
 (0)