Skip to content

Commit af489af

Browse files
pat-nel87pat-nel87
authored
Merge branch 'master' into Issue-107957-black_box_docs
2 parents 21549da + 89c2e3d commit af489af

File tree

3,259 files changed

+86120
-37423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,259 files changed

+86120
-37423
lines changed

‎.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
src/etc/installer/gfx/* binary
1010
src/vendor/** -text
1111
Cargo.lock linguist-generated=false
12-
config.toml.example linguist-language=TOML
1312

1413
# Older git versions try to fix line endings on images and fonts, this prevents it.
1514
*.png binary

‎.github/workflows/ci.yml

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,19 @@ jobs:
4848
include:
4949
- name: mingw-check
5050
tidy: false
51-
os: ubuntu-20.04-xl
51+
os: ubuntu-20.04-16core-64gb
5252
env: {}
5353
- name: mingw-check-tidy
5454
tidy: true
55-
os: ubuntu-20.04-xl
55+
os: ubuntu-20.04-16core-64gb
5656
env: {}
5757
- name: x86_64-gnu-llvm-14
5858
tidy: false
59-
os: ubuntu-20.04-xl
59+
os: ubuntu-20.04-16core-64gb
6060
env: {}
6161
- name: x86_64-gnu-tools
6262
tidy: false
63-
os: ubuntu-20.04-xl
63+
os: ubuntu-20.04-16core-64gb
6464
env: {}
6565
timeout-minutes: 600
6666
runs-on: "${{ matrix.os }}"
@@ -181,136 +181,136 @@ jobs:
181181
- ARM64
182182
- linux
183183
- name: arm-android
184-
os: ubuntu-20.04-xl
184+
os: ubuntu-20.04-16core-64gb
185185
env: {}
186186
- name: armhf-gnu
187-
os: ubuntu-20.04-xl
187+
os: ubuntu-20.04-16core-64gb
188188
env: {}
189189
- name: dist-aarch64-linux
190-
os: ubuntu-20.04-xl
190+
os: ubuntu-20.04-16core-64gb
191191
env: {}
192192
- name: dist-android
193-
os: ubuntu-20.04-xl
193+
os: ubuntu-20.04-16core-64gb
194194
env: {}
195195
- name: dist-arm-linux
196-
os: ubuntu-20.04-xl
196+
os: ubuntu-20.04-16core-64gb
197197
env: {}
198198
- name: dist-armhf-linux
199-
os: ubuntu-20.04-xl
199+
os: ubuntu-20.04-16core-64gb
200200
env: {}
201201
- name: dist-armv7-linux
202-
os: ubuntu-20.04-xl
202+
os: ubuntu-20.04-16core-64gb
203203
env: {}
204204
- name: dist-i586-gnu-i586-i686-musl
205-
os: ubuntu-20.04-xl
205+
os: ubuntu-20.04-16core-64gb
206206
env: {}
207207
- name: dist-i686-linux
208-
os: ubuntu-20.04-xl
208+
os: ubuntu-20.04-16core-64gb
209209
env: {}
210210
- name: dist-mips-linux
211-
os: ubuntu-20.04-xl
211+
os: ubuntu-20.04-16core-64gb
212212
env: {}
213213
- name: dist-mips64-linux
214-
os: ubuntu-20.04-xl
214+
os: ubuntu-20.04-16core-64gb
215215
env: {}
216216
- name: dist-mips64el-linux
217-
os: ubuntu-20.04-xl
217+
os: ubuntu-20.04-16core-64gb
218218
env: {}
219219
- name: dist-mipsel-linux
220-
os: ubuntu-20.04-xl
220+
os: ubuntu-20.04-16core-64gb
221221
env: {}
222222
- name: dist-powerpc-linux
223-
os: ubuntu-20.04-xl
223+
os: ubuntu-20.04-16core-64gb
224224
env: {}
225225
- name: dist-powerpc64-linux
226-
os: ubuntu-20.04-xl
226+
os: ubuntu-20.04-16core-64gb
227227
env: {}
228228
- name: dist-powerpc64le-linux
229-
os: ubuntu-20.04-xl
229+
os: ubuntu-20.04-16core-64gb
230230
env: {}
231231
- name: dist-riscv64-linux
232-
os: ubuntu-20.04-xl
232+
os: ubuntu-20.04-16core-64gb
233233
env: {}
234234
- name: dist-s390x-linux
235-
os: ubuntu-20.04-xl
235+
os: ubuntu-20.04-16core-64gb
236236
env: {}
237237
- name: dist-various-1
238-
os: ubuntu-20.04-xl
238+
os: ubuntu-20.04-16core-64gb
239239
env: {}
240240
- name: dist-various-2
241-
os: ubuntu-20.04-xl
241+
os: ubuntu-20.04-16core-64gb
242242
env: {}
243243
- name: dist-x86_64-freebsd
244-
os: ubuntu-20.04-xl
244+
os: ubuntu-20.04-16core-64gb
245245
env: {}
246246
- name: dist-x86_64-illumos
247-
os: ubuntu-20.04-xl
247+
os: ubuntu-20.04-16core-64gb
248248
env: {}
249249
- name: dist-x86_64-linux
250-
os: ubuntu-20.04-xl
250+
os: ubuntu-20.04-16core-64gb
251251
env: {}
252252
- name: dist-x86_64-linux-alt
253253
env:
254254
IMAGE: dist-x86_64-linux
255-
os: ubuntu-20.04-xl
255+
os: ubuntu-20.04-16core-64gb
256256
- name: dist-x86_64-musl
257-
os: ubuntu-20.04-xl
257+
os: ubuntu-20.04-16core-64gb
258258
env: {}
259259
- name: dist-x86_64-netbsd
260-
os: ubuntu-20.04-xl
260+
os: ubuntu-20.04-16core-64gb
261261
env: {}
262262
- name: i686-gnu
263-
os: ubuntu-20.04-xl
263+
os: ubuntu-20.04-16core-64gb
264264
env: {}
265265
- name: i686-gnu-nopt
266-
os: ubuntu-20.04-xl
266+
os: ubuntu-20.04-16core-64gb
267267
env: {}
268268
- name: mingw-check
269-
os: ubuntu-20.04-xl
269+
os: ubuntu-20.04-16core-64gb
270270
env: {}
271271
- name: test-various
272-
os: ubuntu-20.04-xl
272+
os: ubuntu-20.04-16core-64gb
273273
env: {}
274274
- name: wasm32
275-
os: ubuntu-20.04-xl
275+
os: ubuntu-20.04-16core-64gb
276276
env: {}
277277
- name: x86_64-gnu
278-
os: ubuntu-20.04-xl
278+
os: ubuntu-20.04-16core-64gb
279279
env: {}
280280
- name: x86_64-gnu-stable
281281
env:
282282
IMAGE: x86_64-gnu
283283
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
284284
CI_ONLY_WHEN_CHANNEL: nightly
285-
os: ubuntu-20.04-xl
285+
os: ubuntu-20.04-16core-64gb
286286
- name: x86_64-gnu-aux
287-
os: ubuntu-20.04-xl
287+
os: ubuntu-20.04-16core-64gb
288288
env: {}
289289
- name: x86_64-gnu-debug
290-
os: ubuntu-20.04-xl
290+
os: ubuntu-20.04-16core-64gb
291291
env: {}
292292
- name: x86_64-gnu-distcheck
293-
os: ubuntu-20.04-xl
293+
os: ubuntu-20.04-16core-64gb
294294
env: {}
295295
- name: x86_64-gnu-llvm-15
296296
env:
297297
RUST_BACKTRACE: 1
298-
os: ubuntu-20.04-xl
298+
os: ubuntu-20.04-16core-64gb
299299
- name: x86_64-gnu-llvm-14
300300
env:
301301
RUST_BACKTRACE: 1
302-
os: ubuntu-20.04-xl
302+
os: ubuntu-20.04-16core-64gb
303303
- name: x86_64-gnu-llvm-14-stage1
304304
env:
305305
RUST_BACKTRACE: 1
306-
os: ubuntu-20.04-xl
306+
os: ubuntu-20.04-16core-64gb
307307
- name: x86_64-gnu-nopt
308-
os: ubuntu-20.04-xl
308+
os: ubuntu-20.04-16core-64gb
309309
env: {}
310310
- name: x86_64-gnu-tools
311311
env:
312312
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
313-
os: ubuntu-20.04-xl
313+
os: ubuntu-20.04-16core-64gb
314314
- name: dist-x86_64-apple
315315
env:
316316
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
@@ -322,7 +322,7 @@ jobs:
322322
NO_DEBUG_ASSERTIONS: 1
323323
NO_OVERFLOW_CHECKS: 1
324324
DIST_REQUIRE_ALL_TOOLS: 1
325-
os: macos-latest
325+
os: macos-12-xl
326326
- name: dist-apple-various
327327
env:
328328
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -333,7 +333,7 @@ jobs:
333333
NO_LLVM_ASSERTIONS: 1
334334
NO_DEBUG_ASSERTIONS: 1
335335
NO_OVERFLOW_CHECKS: 1
336-
os: macos-latest
336+
os: macos-12-xl
337337
- name: dist-x86_64-apple-alt
338338
env:
339339
SCRIPT: "./x.py dist bootstrap --include-default-paths"
@@ -344,7 +344,7 @@ jobs:
344344
NO_LLVM_ASSERTIONS: 1
345345
NO_DEBUG_ASSERTIONS: 1
346346
NO_OVERFLOW_CHECKS: 1
347-
os: macos-latest
347+
os: macos-12-xl
348348
- name: x86_64-apple-1
349349
env:
350350
SCRIPT: "./x.py --stage 2 test --exclude tests/ui --exclude tests/rustdoc --exclude tests/run-make-fulldeps"
@@ -355,7 +355,7 @@ jobs:
355355
NO_LLVM_ASSERTIONS: 1
356356
NO_DEBUG_ASSERTIONS: 1
357357
NO_OVERFLOW_CHECKS: 1
358-
os: macos-latest
358+
os: macos-12-xl
359359
- name: x86_64-apple-2
360360
env:
361361
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
@@ -366,7 +366,7 @@ jobs:
366366
NO_LLVM_ASSERTIONS: 1
367367
NO_DEBUG_ASSERTIONS: 1
368368
NO_OVERFLOW_CHECKS: 1
369-
os: macos-latest
369+
os: macos-12-xl
370370
- name: dist-aarch64-apple
371371
env:
372372
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@@ -381,106 +381,106 @@ jobs:
381381
NO_OVERFLOW_CHECKS: 1
382382
DIST_REQUIRE_ALL_TOOLS: 1
383383
JEMALLOC_SYS_WITH_LG_PAGE: 14
384-
os: macos-latest
384+
os: macos-12-xl
385385
- name: x86_64-msvc-1
386386
env:
387387
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
388388
SCRIPT: make ci-subset-1
389-
os: windows-latest-xl
389+
os: windows-2019-8core-32gb
390390
- name: x86_64-msvc-2
391391
env:
392392
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
393393
SCRIPT: make ci-subset-2
394-
os: windows-latest-xl
394+
os: windows-2019-8core-32gb
395395
- name: i686-msvc-1
396396
env:
397397
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc"
398398
SCRIPT: make ci-subset-1
399-
os: windows-latest-xl
399+
os: windows-2019-8core-32gb
400400
- name: i686-msvc-2
401401
env:
402402
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc"
403403
SCRIPT: make ci-subset-2
404-
os: windows-latest-xl
404+
os: windows-2019-8core-32gb
405405
- name: x86_64-msvc-cargo
406406
env:
407407
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo
408408
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld"
409-
os: windows-latest-xl
409+
os: windows-2019-8core-32gb
410410
- name: x86_64-msvc-tools
411411
env:
412412
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
413413
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json"
414414
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
415-
os: windows-latest-xl
415+
os: windows-2019-8core-32gb
416416
- name: i686-mingw-1
417417
env:
418418
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
419419
SCRIPT: make ci-mingw-subset-1
420420
NO_DOWNLOAD_CI_LLVM: 1
421421
CUSTOM_MINGW: 1
422-
os: windows-latest-xl
422+
os: windows-2019-8core-32gb
423423
- name: i686-mingw-2
424424
env:
425425
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
426426
SCRIPT: make ci-mingw-subset-2
427427
NO_DOWNLOAD_CI_LLVM: 1
428428
CUSTOM_MINGW: 1
429-
os: windows-latest-xl
429+
os: windows-2019-8core-32gb
430430
- name: x86_64-mingw-1
431431
env:
432432
SCRIPT: make ci-mingw-subset-1
433433
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
434434
NO_DOWNLOAD_CI_LLVM: 1
435435
CUSTOM_MINGW: 1
436-
os: windows-latest-xl
436+
os: windows-2019-8core-32gb
437437
- name: x86_64-mingw-2
438438
env:
439439
SCRIPT: make ci-mingw-subset-2
440440
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
441441
NO_DOWNLOAD_CI_LLVM: 1
442442
CUSTOM_MINGW: 1
443-
os: windows-latest-xl
443+
os: windows-2019-8core-32gb
444444
- name: dist-x86_64-msvc
445445
env:
446-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler --set rust.lto=thin"
446+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler"
447447
SCRIPT: PGO_HOST=x86_64-pc-windows-msvc python src/ci/stage-build.py python x.py dist bootstrap --include-default-paths
448448
DIST_REQUIRE_ALL_TOOLS: 1
449-
os: windows-latest-xl
449+
os: windows-2019-8core-32gb
450450
- name: dist-i686-msvc
451451
env:
452452
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc --host=i686-pc-windows-msvc --target=i686-pc-windows-msvc,i586-pc-windows-msvc --enable-full-tools --enable-profiler"
453453
SCRIPT: python x.py dist bootstrap --include-default-paths
454454
DIST_REQUIRE_ALL_TOOLS: 1
455-
os: windows-latest-xl
455+
os: windows-2019-8core-32gb
456456
- name: dist-aarch64-msvc
457457
env:
458458
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=aarch64-pc-windows-msvc --enable-full-tools --enable-profiler"
459459
SCRIPT: python x.py dist bootstrap --include-default-paths
460460
DIST_REQUIRE_ALL_TOOLS: 1
461461
WINDOWS_SDK_20348_HACK: 1
462-
os: windows-latest-xl
462+
os: windows-2019-8core-32gb
463463
- name: dist-i686-mingw
464464
env:
465465
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
466466
NO_DOWNLOAD_CI_LLVM: 1
467467
SCRIPT: python x.py dist bootstrap --include-default-paths
468468
CUSTOM_MINGW: 1
469469
DIST_REQUIRE_ALL_TOOLS: 1
470-
os: windows-latest-xl
470+
os: windows-2019-8core-32gb
471471
- name: dist-x86_64-mingw
472472
env:
473473
SCRIPT: python x.py dist bootstrap --include-default-paths
474474
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler"
475475
NO_DOWNLOAD_CI_LLVM: 1
476476
CUSTOM_MINGW: 1
477477
DIST_REQUIRE_ALL_TOOLS: 1
478-
os: windows-latest-xl
478+
os: windows-2019-8core-32gb
479479
- name: dist-x86_64-msvc-alt
480480
env:
481481
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-extended --enable-profiler"
482482
SCRIPT: python x.py dist bootstrap --include-default-paths
483-
os: windows-latest-xl
483+
os: windows-2019-8core-32gb
484484
timeout-minutes: 600
485485
runs-on: "${{ matrix.os }}"
486486
steps:
@@ -595,7 +595,7 @@ jobs:
595595
matrix:
596596
include:
597597
- name: dist-x86_64-linux
598-
os: ubuntu-20.04-xl
598+
os: ubuntu-20.04-16core-64gb
599599
env: {}
600600
timeout-minutes: 600
601601
runs-on: "${{ matrix.os }}"

0 commit comments

Comments
 (0)