Skip to content

Commit fd5c506

Browse files
AmSdGoAmSdGo
committed
same as master. to run full ci
1 parent 00cf19a commit fd5c506

File tree

2 files changed

+217
-42
lines changed

2 files changed

+217
-42
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 79 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,81 @@ jobs:
3737
name: PR
3838
env:
3939
CI_JOB_NAME: "${{ matrix.name }}"
40-
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
4140
SCCACHE_BUCKET: rust-lang-ci-sccache2
4241
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
4342
CACHE_DOMAIN: ci-caches.rust-lang.org
4443
if: "github.event_name == 'pull_request'"
45-
continue-on-error: "${{ matrix.tidy }}"
44+
continue-on-error: false
4645
strategy:
4746
matrix:
4847
include:
4948
- name: mingw-check
5049
tidy: false
5150
os: ubuntu-20.04-xl
5251
env: {}
52+
- name: i686-msvc-2
53+
env:
54+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc"
55+
SCRIPT: make ci-subset-2
56+
os: windows-latest-xl
57+
- name: x86_64-msvc-cargo
58+
env:
59+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo
60+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld"
61+
os: windows-latest-xl
62+
- name: x86_64-msvc-tools
63+
env:
64+
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
65+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json"
66+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
67+
os: windows-latest-xl
68+
- name: x86_64-mingw-2
69+
env:
70+
SCRIPT: make ci-mingw-subset-2
71+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler --set llvm.allow-old-toolchain"
72+
NO_DOWNLOAD_CI_LLVM: 1
73+
CUSTOM_MINGW: 1
74+
os: windows-latest-xl
75+
- name: dist-x86_64-msvc
76+
env:
77+
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"
78+
SCRIPT: PGO_HOST=x86_64-pc-windows-msvc src/ci/pgo.sh python x.py dist bootstrap --include-default-paths
79+
DIST_REQUIRE_ALL_TOOLS: 1
80+
os: windows-latest-xl
81+
- name: dist-i686-msvc
82+
env:
83+
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"
84+
SCRIPT: python x.py dist bootstrap --include-default-paths
85+
DIST_REQUIRE_ALL_TOOLS: 1
86+
os: windows-latest-xl
87+
- name: dist-aarch64-msvc
88+
env:
89+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=aarch64-pc-windows-msvc --enable-full-tools --enable-profiler"
90+
SCRIPT: python x.py dist bootstrap --include-default-paths
91+
DIST_REQUIRE_ALL_TOOLS: 1
92+
WINDOWS_SDK_20348_HACK: 1
93+
os: windows-latest-xl
94+
- name: dist-i686-mingw
95+
env:
96+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler --set llvm.allow-old-toolchain"
97+
NO_DOWNLOAD_CI_LLVM: 1
98+
SCRIPT: python x.py dist bootstrap --include-default-paths
99+
CUSTOM_MINGW: 1
100+
DIST_REQUIRE_ALL_TOOLS: 1
101+
os: windows-latest-xl
102+
- name: dist-x86_64-mingw
103+
env:
104+
SCRIPT: python x.py dist bootstrap --include-default-paths
105+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler --set llvm.allow-old-toolchain"
106+
NO_DOWNLOAD_CI_LLVM: 1
107+
CUSTOM_MINGW: 1
108+
DIST_REQUIRE_ALL_TOOLS: 1
109+
os: windows-latest-xl
110+
- name: dist-x86_64-msvc-alt
111+
env:
112+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-extended --enable-profiler"
113+
SCRIPT: python x.py dist bootstrap --include-default-paths
114+
os: windows-latest-xl
53115
- name: mingw-check-tidy
54116
tidy: true
55117
os: ubuntu-20.04-xl
@@ -60,8 +122,9 @@ jobs:
60122
env: {}
61123
- name: x86_64-gnu-tools
62124
tidy: false
125+
env:
126+
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
63127
os: ubuntu-20.04-xl
64-
env: {}
65128
timeout-minutes: 600
66129
runs-on: "${{ matrix.os }}"
67130
steps:
@@ -162,7 +225,6 @@ jobs:
162225
name: auto
163226
env:
164227
CI_JOB_NAME: "${{ matrix.name }}"
165-
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
166228
SCCACHE_BUCKET: rust-lang-ci-sccache2
167229
DEPLOY_BUCKET: rust-lang-ci2
168230
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
@@ -292,14 +354,6 @@ jobs:
292354
- name: x86_64-gnu-distcheck
293355
os: ubuntu-20.04-xl
294356
env: {}
295-
- name: x86_64-gnu-llvm-15
296-
env:
297-
RUST_BACKTRACE: 1
298-
os: ubuntu-20.04-xl
299-
- name: x86_64-gnu-llvm-14
300-
env:
301-
RUST_BACKTRACE: 1
302-
os: ubuntu-20.04-xl
303357
- name: x86_64-gnu-llvm-13
304358
env:
305359
RUST_BACKTRACE: 1
@@ -326,7 +380,7 @@ jobs:
326380
NO_DEBUG_ASSERTIONS: 1
327381
NO_OVERFLOW_CHECKS: 1
328382
DIST_REQUIRE_ALL_TOOLS: 1
329-
os: macos-latest
383+
os: macos-12-xl
330384
- name: dist-apple-various
331385
env:
332386
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -337,7 +391,7 @@ jobs:
337391
NO_LLVM_ASSERTIONS: 1
338392
NO_DEBUG_ASSERTIONS: 1
339393
NO_OVERFLOW_CHECKS: 1
340-
os: macos-latest
394+
os: macos-12-xl
341395
- name: dist-x86_64-apple-alt
342396
env:
343397
SCRIPT: "./x.py dist bootstrap --include-default-paths"
@@ -348,7 +402,7 @@ jobs:
348402
NO_LLVM_ASSERTIONS: 1
349403
NO_DEBUG_ASSERTIONS: 1
350404
NO_OVERFLOW_CHECKS: 1
351-
os: macos-latest
405+
os: macos-12-xl
352406
- name: x86_64-apple-1
353407
env:
354408
SCRIPT: "./x.py --stage 2 test --exclude tests/ui --exclude tests/rustdoc --exclude tests/run-make-fulldeps"
@@ -359,7 +413,7 @@ jobs:
359413
NO_LLVM_ASSERTIONS: 1
360414
NO_DEBUG_ASSERTIONS: 1
361415
NO_OVERFLOW_CHECKS: 1
362-
os: macos-latest
416+
os: macos-12-xl
363417
- name: x86_64-apple-2
364418
env:
365419
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
@@ -370,7 +424,7 @@ jobs:
370424
NO_LLVM_ASSERTIONS: 1
371425
NO_DEBUG_ASSERTIONS: 1
372426
NO_OVERFLOW_CHECKS: 1
373-
os: macos-latest
427+
os: macos-12-xl
374428
- name: dist-aarch64-apple
375429
env:
376430
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@@ -385,7 +439,7 @@ jobs:
385439
NO_OVERFLOW_CHECKS: 1
386440
DIST_REQUIRE_ALL_TOOLS: 1
387441
JEMALLOC_SYS_WITH_LG_PAGE: 14
388-
os: macos-latest
442+
os: macos-12-xl
389443
- name: x86_64-msvc-1
390444
env:
391445
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
@@ -419,36 +473,36 @@ jobs:
419473
os: windows-latest-xl
420474
- name: i686-mingw-1
421475
env:
422-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
476+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --set llvm.allow-old-toolchain"
423477
SCRIPT: make ci-mingw-subset-1
424478
NO_DOWNLOAD_CI_LLVM: 1
425479
CUSTOM_MINGW: 1
426480
os: windows-latest-xl
427481
- name: i686-mingw-2
428482
env:
429-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
483+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --set llvm.allow-old-toolchain"
430484
SCRIPT: make ci-mingw-subset-2
431485
NO_DOWNLOAD_CI_LLVM: 1
432486
CUSTOM_MINGW: 1
433487
os: windows-latest-xl
434488
- name: x86_64-mingw-1
435489
env:
436490
SCRIPT: make ci-mingw-subset-1
437-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
491+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler --set llvm.allow-old-toolchain"
438492
NO_DOWNLOAD_CI_LLVM: 1
439493
CUSTOM_MINGW: 1
440494
os: windows-latest-xl
441495
- name: x86_64-mingw-2
442496
env:
443497
SCRIPT: make ci-mingw-subset-2
444-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
498+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler --set llvm.allow-old-toolchain"
445499
NO_DOWNLOAD_CI_LLVM: 1
446500
CUSTOM_MINGW: 1
447501
os: windows-latest-xl
448502
- name: dist-x86_64-msvc
449503
env:
450504
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"
451-
SCRIPT: PGO_HOST=x86_64-pc-windows-msvc python src/ci/stage-build.py python x.py dist bootstrap --include-default-paths
505+
SCRIPT: PGO_HOST=x86_64-pc-windows-msvc src/ci/pgo.sh python x.py dist bootstrap --include-default-paths
452506
DIST_REQUIRE_ALL_TOOLS: 1
453507
os: windows-latest-xl
454508
- name: dist-i686-msvc
@@ -466,7 +520,7 @@ jobs:
466520
os: windows-latest-xl
467521
- name: dist-i686-mingw
468522
env:
469-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
523+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler --set llvm.allow-old-toolchain"
470524
NO_DOWNLOAD_CI_LLVM: 1
471525
SCRIPT: python x.py dist bootstrap --include-default-paths
472526
CUSTOM_MINGW: 1
@@ -475,7 +529,7 @@ jobs:
475529
- name: dist-x86_64-mingw
476530
env:
477531
SCRIPT: python x.py dist bootstrap --include-default-paths
478-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler"
532+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler --set llvm.allow-old-toolchain"
479533
NO_DOWNLOAD_CI_LLVM: 1
480534
CUSTOM_MINGW: 1
481535
DIST_REQUIRE_ALL_TOOLS: 1
@@ -585,7 +639,6 @@ jobs:
585639
name: try
586640
env:
587641
CI_JOB_NAME: "${{ matrix.name }}"
588-
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
589642
SCCACHE_BUCKET: rust-lang-ci-sccache2
590643
DEPLOY_BUCKET: rust-lang-ci2
591644
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"

0 commit comments

Comments
 (0)