Skip to content

Commit 797fd92

Browse files
committed
Auto merge of #66776 - Mark-Simulacrum:revert-try-breakage, r=Mark-Simulacrum
Revert "DO NOT MERGE: enable windows try builder" This reverts commit 90a37bc.
2 parents 1dc3686 + 47b3d4d commit 797fd92

File tree

1 file changed

+59
-10
lines changed

1 file changed

+59
-10
lines changed

src/ci/azure-pipelines/try.yml

+59-10
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,68 @@ variables:
66
- group: prod-credentials
77

88
jobs:
9-
- job: Windows
9+
- job: Linux
1010
timeoutInMinutes: 600
1111
pool:
12-
vmImage: 'vs2017-win2016'
12+
vmImage: ubuntu-16.04
1313
steps:
1414
- template: steps/run.yml
1515
strategy:
1616
matrix:
17-
dist-x86_64-msvc:
18-
RUST_CONFIGURE_ARGS: >-
19-
--build=x86_64-pc-windows-msvc
20-
--target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
21-
--enable-full-tools
22-
--enable-profiler
23-
SCRIPT: python x.py dist
24-
DIST_REQUIRE_ALL_TOOLS: 1
17+
dist-x86_64-linux: {}
18+
dist-x86_64-linux-alt:
19+
IMAGE: dist-x86_64-linux
20+
21+
# The macOS and Windows builds here are currently disabled due to them not being
22+
# overly necessary on `try` builds. We also don't actually have anything that
23+
# consumes the artifacts currently. Perhaps one day we can reenable, but for now
24+
# it helps free up capacity on Azure.
25+
# - job: macOS
26+
# timeoutInMinutes: 600
27+
# pool:
28+
# vmImage: macos-10.13
29+
# steps:
30+
# - template: steps/run.yml
31+
# strategy:
32+
# matrix:
33+
# dist-x86_64-apple:
34+
# SCRIPT: ./x.py dist
35+
# RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc
36+
# DEPLOY: 1
37+
# RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
38+
# MACOSX_DEPLOYMENT_TARGET: 10.7
39+
# NO_LLVM_ASSERTIONS: 1
40+
# NO_DEBUG_ASSERTIONS: 1
41+
# DIST_REQUIRE_ALL_TOOLS: 1
42+
#
43+
# dist-x86_64-apple-alt:
44+
# SCRIPT: ./x.py dist
45+
# RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc
46+
# DEPLOY_ALT: 1
47+
# RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
48+
# MACOSX_DEPLOYMENT_TARGET: 10.7
49+
# NO_LLVM_ASSERTIONS: 1
50+
# NO_DEBUG_ASSERTIONS: 1
51+
#
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

0 commit comments

Comments
 (0)