Skip to content

Commit d2bf98f

Browse files
Mark-SimulacrumAmanieu
authored andcommitted
[DO NOT MERGE] enable windows builders
1 parent fb1376c commit d2bf98f

File tree

2 files changed

+79
-33
lines changed

2 files changed

+79
-33
lines changed

src/ci/azure-pipelines/pr.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,54 @@ jobs:
2222
mingw-check: {}
2323
x86_64-gnu-tools:
2424
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
25+
- job: Windows
26+
timeoutInMinutes: 600
27+
pool:
28+
vmImage: 'vs2017-win2016'
29+
steps:
30+
- template: steps/run.yml
31+
strategy:
32+
matrix:
33+
x86_64-msvc-1:
34+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
35+
SCRIPT: make ci-subset-1
36+
# FIXME(#59637)
37+
NO_DEBUG_ASSERTIONS: 1
38+
NO_LLVM_ASSERTIONS: 1
39+
x86_64-msvc-2:
40+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
41+
SCRIPT: make ci-subset-2
42+
i686-msvc-1:
43+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
44+
SCRIPT: make ci-subset-1
45+
# FIXME(#59637)
46+
NO_DEBUG_ASSERTIONS: 1
47+
NO_LLVM_ASSERTIONS: 1
48+
i686-msvc-2:
49+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
50+
SCRIPT: make ci-subset-2
51+
# FIXME(#59637)
52+
NO_DEBUG_ASSERTIONS: 1
53+
NO_LLVM_ASSERTIONS: 1
54+
i686-mingw-1:
55+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
56+
SCRIPT: make ci-mingw-subset-1
57+
CUSTOM_MINGW: 1
58+
# FIXME(#59637)
59+
NO_DEBUG_ASSERTIONS: 1
60+
NO_LLVM_ASSERTIONS: 1
61+
i686-mingw-2:
62+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
63+
SCRIPT: make ci-mingw-subset-2
64+
CUSTOM_MINGW: 1
65+
x86_64-mingw-1:
66+
SCRIPT: make ci-mingw-subset-1
67+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
68+
CUSTOM_MINGW: 1
69+
# FIXME(#59637)
70+
NO_DEBUG_ASSERTIONS: 1
71+
NO_LLVM_ASSERTIONS: 1
72+
x86_64-mingw-2:
73+
SCRIPT: make ci-mingw-subset-2
74+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
75+
CUSTOM_MINGW: 1

src/ci/azure-pipelines/try.yml

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ variables:
66
- group: prod-credentials
77

88
jobs:
9-
- job: Linux
10-
timeoutInMinutes: 600
11-
pool:
12-
vmImage: ubuntu-16.04
13-
steps:
14-
- template: steps/run.yml
15-
strategy:
16-
matrix:
17-
dist-x86_64-linux: {}
18-
dist-x86_64-linux-alt:
19-
IMAGE: dist-x86_64-linux
9+
# - job: Linux
10+
# timeoutInMinutes: 600
11+
# pool:
12+
# vmImage: ubuntu-16.04
13+
# steps:
14+
# - template: steps/run.yml
15+
# strategy:
16+
# matrix:
17+
# dist-x86_64-linux: {}
18+
# dist-x86_64-linux-alt:
19+
# IMAGE: dist-x86_64-linux
2020

2121
# The macOS and Windows builds here are currently disabled due to them not being
2222
# overly necessary on `try` builds. We also don't actually have anything that
@@ -49,25 +49,20 @@ jobs:
4949
# NO_LLVM_ASSERTIONS: 1
5050
# NO_DEBUG_ASSERTIONS: 1
5151
#
52-
# - job: Windows
53-
# timeoutInMinutes: 600
54-
# pool:
55-
# vmImage: 'vs2017-win2016'
56-
# steps:
57-
# - template: steps/run.yml
58-
# strategy:
59-
# matrix:
60-
# dist-x86_64-msvc:
61-
# RUST_CONFIGURE_ARGS: >
62-
# --build=x86_64-pc-windows-msvc
63-
# --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
64-
# --enable-full-tools
65-
# --enable-profiler
66-
# SCRIPT: python x.py dist
67-
# DIST_REQUIRE_ALL_TOOLS: 1
68-
# DEPLOY: 1
69-
#
70-
# dist-x86_64-msvc-alt:
71-
# RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
72-
# SCRIPT: python x.py dist
73-
# DEPLOY_ALT: 1
52+
- job: Windows
53+
timeoutInMinutes: 600
54+
pool:
55+
vmImage: 'vs2017-win2016'
56+
steps:
57+
- template: steps/run.yml
58+
strategy:
59+
matrix:
60+
i686-mingw-2:
61+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
62+
SCRIPT: make ci-mingw-subset-2
63+
CUSTOM_MINGW: 1
64+
dist-i686-mingw:
65+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-debug-assertions --enable-optimize --debuginfo-level=1
66+
SCRIPT: python x.py dist
67+
CUSTOM_MINGW: 1
68+
N_DIST_REQUIRE_ALL_TOOLS: 1

0 commit comments

Comments
 (0)