File tree 2 files changed +18
-8
lines changed
2 files changed +18
-8
lines changed Original file line number Diff line number Diff line change @@ -527,7 +527,6 @@ jobs:
527
527
try :
528
528
name : " try - ${{ matrix.name }}"
529
529
env :
530
- DIST_TRY_BUILD : 1
531
530
CI_JOB_NAME : " ${{ matrix.name }}"
532
531
CARGO_REGISTRIES_CRATES_IO_PROTOCOL : sparse
533
532
HEAD_SHA : " ${{ github.event.pull_request.head.sha || github.sha }}"
@@ -544,9 +543,12 @@ jobs:
544
543
strategy :
545
544
matrix :
546
545
include :
547
- - name : dist-x86_64-linux
548
- os : ubuntu-20.04-16core-64gb
549
- env : {}
546
+ - name : dist-x86_64-msvc
547
+ env :
548
+ 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"
549
+ SCRIPT : python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
550
+ DIST_REQUIRE_ALL_TOOLS : 1
551
+ os : windows-2019-8core-32gb
550
552
timeout-minutes : 600
551
553
runs-on : " ${{ matrix.os }}"
552
554
steps :
Original file line number Diff line number Diff line change @@ -687,15 +687,23 @@ jobs:
687
687
<< : *base-ci-job
688
688
name : try - ${{ matrix.name }}
689
689
env :
690
- DIST_TRY_BUILD : 1
690
+ # DIST_TRY_BUILD: 1
691
691
<< : [*shared-ci-variables, *prod-variables]
692
692
if : github.event_name == 'push' && (((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust') || ((github.ref == 'refs/heads/automation/bors/try') && github.repository == 'rust-lang/rust'))
693
693
strategy :
694
694
matrix :
695
695
include :
696
- - &dist-x86_64-linux
697
- name : dist-x86_64-linux
698
- << : *job-linux-16c
696
+ - name : dist-x86_64-msvc
697
+ env :
698
+ RUST_CONFIGURE_ARGS : >-
699
+ --build=x86_64-pc-windows-msvc
700
+ --host=x86_64-pc-windows-msvc
701
+ --target=x86_64-pc-windows-msvc
702
+ --enable-full-tools
703
+ --enable-profiler
704
+ SCRIPT : python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
705
+ DIST_REQUIRE_ALL_TOOLS : 1
706
+ << : *job-windows-8c
699
707
700
708
master :
701
709
name : master
You can’t perform that action at this time.
0 commit comments