Skip to content

Commit 523000f

Browse files
committed
[DO NOT MERGE] Run windows on try builds
1 parent 6aeea06 commit 523000f

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

.github/workflows/ci.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,6 @@ jobs:
527527
try:
528528
name: "try - ${{ matrix.name }}"
529529
env:
530-
DIST_TRY_BUILD: 1
531530
CI_JOB_NAME: "${{ matrix.name }}"
532531
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
533532
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
@@ -544,9 +543,12 @@ jobs:
544543
strategy:
545544
matrix:
546545
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
550552
timeout-minutes: 600
551553
runs-on: "${{ matrix.os }}"
552554
steps:

src/ci/github-actions/ci.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -687,15 +687,23 @@ jobs:
687687
<<: *base-ci-job
688688
name: try - ${{ matrix.name }}
689689
env:
690-
DIST_TRY_BUILD: 1
690+
# DIST_TRY_BUILD: 1
691691
<<: [*shared-ci-variables, *prod-variables]
692692
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'))
693693
strategy:
694694
matrix:
695695
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
699707

700708
master:
701709
name: master

0 commit comments

Comments
 (0)