Skip to content

Commit cbaeec1

Browse files
borsbors
committed
Auto merge of #92983 - pietroalbini:pa-bump-runner-images, r=Mark-Simulacrum
Update Linux runners to Ubuntu 20.04 r? `@Mark-Simulacrum`
2 parents 4d8b66a + 203aeb5 commit cbaeec1

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

‎.github/workflows/ci.yml

+43-43
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ jobs:
4141
matrix:
4242
include:
4343
- name: mingw-check
44-
os: ubuntu-latest-xl
44+
os: ubuntu-20.04-xl
4545
env: {}
4646
- name: x86_64-gnu-llvm-12
47-
os: ubuntu-latest-xl
47+
os: ubuntu-20.04-xl
4848
env: {}
4949
- name: x86_64-gnu-tools
5050
env:
5151
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
52-
os: ubuntu-latest-xl
52+
os: ubuntu-20.04-xl
5353
timeout-minutes: 600
5454
runs-on: "${{ matrix.os }}"
5555
steps:
@@ -166,128 +166,128 @@ jobs:
166166
- ARM64
167167
- linux
168168
- name: arm-android
169-
os: ubuntu-latest-xl
169+
os: ubuntu-20.04-xl
170170
env: {}
171171
- name: armhf-gnu
172-
os: ubuntu-latest-xl
172+
os: ubuntu-20.04-xl
173173
env: {}
174174
- name: dist-aarch64-linux
175-
os: ubuntu-latest-xl
175+
os: ubuntu-20.04-xl
176176
env: {}
177177
- name: dist-android
178-
os: ubuntu-latest-xl
178+
os: ubuntu-20.04-xl
179179
env: {}
180180
- name: dist-arm-linux
181-
os: ubuntu-latest-xl
181+
os: ubuntu-20.04-xl
182182
env: {}
183183
- name: dist-armhf-linux
184-
os: ubuntu-latest-xl
184+
os: ubuntu-20.04-xl
185185
env: {}
186186
- name: dist-armv7-linux
187-
os: ubuntu-latest-xl
187+
os: ubuntu-20.04-xl
188188
env: {}
189189
- name: dist-i586-gnu-i586-i686-musl
190-
os: ubuntu-latest-xl
190+
os: ubuntu-20.04-xl
191191
env: {}
192192
- name: dist-i686-linux
193-
os: ubuntu-latest-xl
193+
os: ubuntu-20.04-xl
194194
env: {}
195195
- name: dist-mips-linux
196-
os: ubuntu-latest-xl
196+
os: ubuntu-20.04-xl
197197
env: {}
198198
- name: dist-mips64-linux
199-
os: ubuntu-latest-xl
199+
os: ubuntu-20.04-xl
200200
env: {}
201201
- name: dist-mips64el-linux
202-
os: ubuntu-latest-xl
202+
os: ubuntu-20.04-xl
203203
env: {}
204204
- name: dist-mipsel-linux
205-
os: ubuntu-latest-xl
205+
os: ubuntu-20.04-xl
206206
env: {}
207207
- name: dist-powerpc-linux
208-
os: ubuntu-latest-xl
208+
os: ubuntu-20.04-xl
209209
env: {}
210210
- name: dist-powerpc64-linux
211-
os: ubuntu-latest-xl
211+
os: ubuntu-20.04-xl
212212
env: {}
213213
- name: dist-powerpc64le-linux
214-
os: ubuntu-latest-xl
214+
os: ubuntu-20.04-xl
215215
env: {}
216216
- name: dist-riscv64-linux
217-
os: ubuntu-latest-xl
217+
os: ubuntu-20.04-xl
218218
env: {}
219219
- name: dist-s390x-linux
220-
os: ubuntu-latest-xl
220+
os: ubuntu-20.04-xl
221221
env: {}
222222
- name: dist-various-1
223-
os: ubuntu-latest-xl
223+
os: ubuntu-20.04-xl
224224
env: {}
225225
- name: dist-various-2
226-
os: ubuntu-latest-xl
226+
os: ubuntu-20.04-xl
227227
env: {}
228228
- name: dist-x86_64-freebsd
229-
os: ubuntu-latest-xl
229+
os: ubuntu-20.04-xl
230230
env: {}
231231
- name: dist-x86_64-illumos
232-
os: ubuntu-latest-xl
232+
os: ubuntu-20.04-xl
233233
env: {}
234234
- name: dist-x86_64-linux
235-
os: ubuntu-latest-xl
235+
os: ubuntu-20.04-xl
236236
env: {}
237237
- name: dist-x86_64-linux-alt
238238
env:
239239
IMAGE: dist-x86_64-linux
240-
os: ubuntu-latest-xl
240+
os: ubuntu-20.04-xl
241241
- name: dist-x86_64-musl
242-
os: ubuntu-latest-xl
242+
os: ubuntu-20.04-xl
243243
env: {}
244244
- name: dist-x86_64-netbsd
245-
os: ubuntu-latest-xl
245+
os: ubuntu-20.04-xl
246246
env: {}
247247
- name: i686-gnu
248-
os: ubuntu-latest-xl
248+
os: ubuntu-20.04-xl
249249
env: {}
250250
- name: i686-gnu-nopt
251-
os: ubuntu-latest-xl
251+
os: ubuntu-20.04-xl
252252
env: {}
253253
- name: mingw-check
254-
os: ubuntu-latest-xl
254+
os: ubuntu-20.04-xl
255255
env: {}
256256
- name: test-various
257-
os: ubuntu-latest-xl
257+
os: ubuntu-20.04-xl
258258
env: {}
259259
- name: wasm32
260-
os: ubuntu-latest-xl
260+
os: ubuntu-20.04-xl
261261
env: {}
262262
- name: x86_64-gnu
263-
os: ubuntu-latest-xl
263+
os: ubuntu-20.04-xl
264264
env: {}
265265
- name: x86_64-gnu-stable
266266
env:
267267
IMAGE: x86_64-gnu
268268
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
269269
CI_ONLY_WHEN_CHANNEL: nightly
270-
os: ubuntu-latest-xl
270+
os: ubuntu-20.04-xl
271271
- name: x86_64-gnu-aux
272-
os: ubuntu-latest-xl
272+
os: ubuntu-20.04-xl
273273
env: {}
274274
- name: x86_64-gnu-debug
275-
os: ubuntu-latest-xl
275+
os: ubuntu-20.04-xl
276276
env: {}
277277
- name: x86_64-gnu-distcheck
278-
os: ubuntu-latest-xl
278+
os: ubuntu-20.04-xl
279279
env: {}
280280
- name: x86_64-gnu-llvm-12
281281
env:
282282
RUST_BACKTRACE: 1
283-
os: ubuntu-latest-xl
283+
os: ubuntu-20.04-xl
284284
- name: x86_64-gnu-nopt
285-
os: ubuntu-latest-xl
285+
os: ubuntu-20.04-xl
286286
env: {}
287287
- name: x86_64-gnu-tools
288288
env:
289289
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
290-
os: ubuntu-latest-xl
290+
os: ubuntu-20.04-xl
291291
- name: dist-x86_64-apple
292292
env:
293293
SCRIPT: "./x.py dist --exclude rust-docs --exclude extended && ./x.py dist --target=x86_64-apple-darwin rust-docs && ./x.py dist extended"
@@ -538,7 +538,7 @@ jobs:
538538
matrix:
539539
include:
540540
- name: dist-x86_64-linux
541-
os: ubuntu-latest-xl
541+
os: ubuntu-20.04-xl
542542
env: {}
543543
timeout-minutes: 600
544544
runs-on: "${{ matrix.os }}"

‎src/ci/github-actions/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ x--expand-yaml-anchors--remove:
7373
env: {}
7474

7575
- &job-linux-xl
76-
os: ubuntu-latest-xl
76+
os: ubuntu-20.04-xl
7777
<<: *base-job
7878

7979
- &job-macos-xl

0 commit comments

Comments
 (0)