Skip to content

Commit c5ff6fc

Browse files
committed
Auto merge of #69963 - nellshamrell:test-azure-vars, r=<try>
Test azure vars Please disregard this pull request - I am opening it only to run all builds on #69894
2 parents 1572c43 + 5cc1134 commit c5ff6fc

File tree

3 files changed

+228
-26
lines changed

3 files changed

+228
-26
lines changed

src/ci/azure-pipelines/auto.yml

+19-19
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
# version that we're using, 8.2, cannot compile LLVM for OSX 10.7.
7777
x86_64-apple:
7878
SCRIPT: ./x.py test
79-
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
79+
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
8080
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
8181
MACOSX_DEPLOYMENT_TARGET: 10.8
8282
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
@@ -85,7 +85,7 @@ jobs:
8585

8686
dist-x86_64-apple:
8787
SCRIPT: ./x.py dist
88-
RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc
88+
IINTIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc
8989
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
9090
MACOSX_DEPLOYMENT_TARGET: 10.7
9191
NO_LLVM_ASSERTIONS: 1
@@ -94,7 +94,7 @@ jobs:
9494

9595
dist-x86_64-apple-alt:
9696
SCRIPT: ./x.py dist
97-
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc
97+
INITIAL_RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc
9898
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
9999
MACOSX_DEPLOYMENT_TARGET: 10.7
100100
NO_LLVM_ASSERTIONS: 1
@@ -111,41 +111,41 @@ jobs:
111111
matrix:
112112
# 32/64 bit MSVC tests
113113
x86_64-msvc-1:
114-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
114+
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
115115
SCRIPT: make ci-subset-1
116116
# FIXME(#59637)
117117
NO_DEBUG_ASSERTIONS: 1
118118
NO_LLVM_ASSERTIONS: 1
119119
x86_64-msvc-2:
120-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
120+
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
121121
SCRIPT: make ci-subset-2
122122
i686-msvc-1:
123-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
123+
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
124124
SCRIPT: make ci-subset-1
125125
# FIXME(#59637)
126126
NO_DEBUG_ASSERTIONS: 1
127127
NO_LLVM_ASSERTIONS: 1
128128
i686-msvc-2:
129-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
129+
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
130130
SCRIPT: make ci-subset-2
131131
# FIXME(#59637)
132132
NO_DEBUG_ASSERTIONS: 1
133133
NO_LLVM_ASSERTIONS: 1
134134
# MSVC aux tests
135135
x86_64-msvc-aux:
136136
RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1
137-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
137+
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
138138
x86_64-msvc-cargo:
139139
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
140-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
140+
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
141141
VCVARS_BAT: vcvars64.bat
142142
# FIXME(#59637)
143143
NO_DEBUG_ASSERTIONS: 1
144144
NO_LLVM_ASSERTIONS: 1
145145
# MSVC tools tests
146146
x86_64-msvc-tools:
147147
SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py
148-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json
148+
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json
149149

150150
# 32/64-bit MinGW builds.
151151
#
@@ -161,57 +161,57 @@ jobs:
161161
# came from the mingw-w64 SourceForge download site. Unfortunately
162162
# SourceForge is notoriously flaky, so we mirror it on our own infrastructure.
163163
i686-mingw-1:
164-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
164+
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
165165
SCRIPT: make ci-mingw-subset-1
166166
CUSTOM_MINGW: 1
167167
# FIXME(#59637)
168168
NO_DEBUG_ASSERTIONS: 1
169169
NO_LLVM_ASSERTIONS: 1
170170
i686-mingw-2:
171-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
171+
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
172172
SCRIPT: make ci-mingw-subset-2
173173
CUSTOM_MINGW: 1
174174
x86_64-mingw-1:
175175
SCRIPT: make ci-mingw-subset-1
176-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
176+
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
177177
CUSTOM_MINGW: 1
178178
# FIXME(#59637)
179179
NO_DEBUG_ASSERTIONS: 1
180180
NO_LLVM_ASSERTIONS: 1
181181
x86_64-mingw-2:
182182
SCRIPT: make ci-mingw-subset-2
183-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
183+
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
184184
CUSTOM_MINGW: 1
185185

186186
# 32/64 bit MSVC and GNU deployment
187187
dist-x86_64-msvc:
188-
RUST_CONFIGURE_ARGS: >-
188+
INITIAL_RUST_CONFIGURE_ARGS: >-
189189
--build=x86_64-pc-windows-msvc
190190
--target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
191191
--enable-full-tools
192192
--enable-profiler
193193
SCRIPT: python x.py dist
194194
DIST_REQUIRE_ALL_TOOLS: 1
195195
dist-i686-msvc:
196-
RUST_CONFIGURE_ARGS: >-
196+
INITIAL_RUST_CONFIGURE_ARGS: >-
197197
--build=i686-pc-windows-msvc
198198
--target=i586-pc-windows-msvc
199199
--enable-full-tools
200200
--enable-profiler
201201
SCRIPT: python x.py dist
202202
DIST_REQUIRE_ALL_TOOLS: 1
203203
dist-i686-mingw:
204-
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler
204+
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler
205205
SCRIPT: python x.py dist
206206
CUSTOM_MINGW: 1
207207
DIST_REQUIRE_ALL_TOOLS: 1
208208
dist-x86_64-mingw:
209209
SCRIPT: python x.py dist
210-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler
210+
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler
211211
CUSTOM_MINGW: 1
212212
DIST_REQUIRE_ALL_TOOLS: 1
213213

214214
# "alternate" deployment, see .travis.yml for more info
215215
dist-x86_64-msvc-alt:
216-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
216+
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
217217
SCRIPT: python x.py dist

src/ci/azure-pipelines/try.yml

+202-7
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,205 @@ jobs:
1414
- template: steps/run.yml
1515
strategy:
1616
matrix:
17-
dist-x86_64-linux: {}
18-
dist-x86_64-linux-alt:
19-
IMAGE: dist-x86_64-linux
17+
# Round 1
18+
# x86_64-gnu-llvm-7:
19+
# RUST_BACKTRACE: 1
20+
# dist-x86_64-linux: {}
21+
# dist-x86_64-linux-alt:
22+
# IMAGE: dist-x86_64-linux
23+
# arm-android: {}
24+
# armhf-gnu: {}
25+
# dist-various-1: {}
26+
# dist-various-2: {}
27+
# dist-aarch64-linux: {}
28+
# dist-android: {}
29+
# dist-arm-linux: {}
30+
# dist-armhf-linux: {}
31+
# dist-armv7-linux: {}
32+
# dist-i586-gnu-i586-i686-musl: {}
33+
# dist-i686-freebsd: {}
34+
# dist-i686-linux: {}
35+
# dist-mips-linux: {}
36+
# dist-mips64-linux: {}
37+
# dist-mips64el-linux: {}
38+
# dist-mipsel-linux: {}
39+
# dist-powerpc-linux: {}
40+
# dist-powerpc64-linux: {}
41+
# dist-powerpc64le-linux: {}
42+
# dist-s390x-linux: {}
43+
# dist-x86_64-freebsd: {}
44+
# dist-x86_64-musl: {}
45+
# dist-x86_64-netbsd: {}
46+
# i686-gnu: {}
47+
# i686-gnu-nopt: {}
48+
# test-various: {}
49+
# wasm32: {}
50+
# x86_64-gnu: {}
51+
# x86_64-gnu-full-bootstrap: {}
52+
# x86_64-gnu-aux: {}
53+
# x86_64-gnu-tools:
54+
# DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
55+
# x86_64-gnu-debug: {}
56+
# x86_64-gnu-nopt: {}
57+
# x86_64-gnu-distcheck: {}
58+
# mingw-check: {}
59+
#
60+
- job: macOS
61+
timeoutInMinutes: 600
62+
pool:
63+
vmImage: macos-10.15
64+
steps:
65+
- template: steps/run.yml
66+
strategy:
67+
matrix:
68+
# OSX builders running tests, these run the full test suite.
69+
# NO_DEBUG_ASSERTIONS=1 to make them go faster, but also do have some
70+
# runners that run `//ignore-debug` tests.
71+
#
72+
# Note that the compiler is compiled to target 10.8 here because the Xcode
73+
# version that we're using, 8.2, cannot compile LLVM for OSX 10.7.
74+
x86_64-apple:
75+
SCRIPT: ./x.py test
76+
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
77+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
78+
MACOSX_DEPLOYMENT_TARGET: 10.8
79+
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
80+
NO_LLVM_ASSERTIONS: 1
81+
NO_DEBUG_ASSERTIONS: 1
82+
83+
dist-x86_64-apple:
84+
SCRIPT: ./x.py dist
85+
INITIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc
86+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
87+
MACOSX_DEPLOYMENT_TARGET: 10.7
88+
NO_LLVM_ASSERTIONS: 1
89+
NO_DEBUG_ASSERTIONS: 1
90+
DIST_REQUIRE_ALL_TOOLS: 1
91+
92+
dist-x86_64-apple-alt:
93+
SCRIPT: ./x.py dist
94+
INITIAL_RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc
95+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
96+
MACOSX_DEPLOYMENT_TARGET: 10.7
97+
NO_LLVM_ASSERTIONS: 1
98+
NO_DEBUG_ASSERTIONS: 1
99+
20100

101+
- job: Windows
102+
timeoutInMinutes: 600
103+
pool:
104+
vmImage: 'vs2017-win2016'
105+
steps:
106+
- template: steps/run.yml
107+
strategy:
108+
matrix:
109+
# 32/64 bit MSVC tests
110+
# x86_64-msvc-1:
111+
# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
112+
# SCRIPT: make ci-subset-1
113+
# # FIXME(#59637)
114+
# NO_DEBUG_ASSERTIONS: 1
115+
# NO_LLVM_ASSERTIONS: 1
116+
# x86_64-msvc-2:
117+
# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
118+
# SCRIPT: make ci-subset-2
119+
i686-msvc-1:
120+
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
121+
SCRIPT: make ci-subset-1
122+
# FIXME(#59637)
123+
NO_DEBUG_ASSERTIONS: 1
124+
NO_LLVM_ASSERTIONS: 1
125+
i686-msvc-2:
126+
INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
127+
SCRIPT: make ci-subset-2
128+
# FIXME(#59637)
129+
NO_DEBUG_ASSERTIONS: 1
130+
NO_LLVM_ASSERTIONS: 1
131+
# MSVC aux tests
132+
# x86_64-msvc-aux:
133+
# RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1
134+
# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
135+
# x86_64-msvc-cargo:
136+
# SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
137+
# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
138+
# VCVARS_BAT: vcvars64.bat
139+
# FIXME(#59637)
140+
# NO_DEBUG_ASSERTIONS: 1
141+
# NO_LLVM_ASSERTIONS: 1
142+
# MSVC tools tests
143+
# x86_64-msvc-tools:
144+
# SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py
145+
# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json
146+
147+
# 32/64-bit MinGW builds.
148+
#
149+
# We are using MinGW with posix threads since LLVM does not compile with
150+
# the win32 threads version due to missing support for C++'s std::thread.
151+
#
152+
# Instead of relying on the MinGW version installed on appveryor we download
153+
# and install one ourselves so we won't be surprised by changes to appveyor's
154+
# build image.
155+
#
156+
# Finally, note that the downloads below are all in the `rust-lang-ci` S3
157+
# bucket, but they cleraly didn't originate there! The downloads originally
158+
# came from the mingw-w64 SourceForge download site. Unfortunately
159+
# SourceForge is notoriously flaky, so we mirror it on our own infrastructure.
160+
# i686-mingw-1:
161+
# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
162+
# SCRIPT: make ci-mingw-subset-1
163+
# CUSTOM_MINGW: 1
164+
# FIXME(#59637)
165+
# NO_DEBUG_ASSERTIONS: 1
166+
# NO_LLVM_ASSERTIONS: 1
167+
# i686-mingw-2:
168+
# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
169+
# SCRIPT: make ci-mingw-subset-2
170+
# CUSTOM_MINGW: 1
171+
# x86_64-mingw-1:
172+
# SCRIPT: make ci-mingw-subset-1
173+
# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
174+
# CUSTOM_MINGW: 1
175+
# FIXME(#59637)
176+
# NO_DEBUG_ASSERTIONS: 1
177+
# NO_LLVM_ASSERTIONS: 1
178+
# x86_64-mingw-2:
179+
# SCRIPT: make ci-mingw-subset-2
180+
# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
181+
# CUSTOM_MINGW: 1
182+
183+
# 32/64 bit MSVC and GNU deployment
184+
# dist-x86_64-msvc:
185+
# INITIAL_RUST_CONFIGURE_ARGS: >-
186+
# --build=x86_64-pc-windows-msvc
187+
# --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
188+
# --enable-full-tools
189+
# --enable-profiler
190+
# SCRIPT: python x.py dist
191+
# DIST_REQUIRE_ALL_TOOLS: 1
192+
# dist-i686-msvc:
193+
# INITIAL_RUST_CONFIGURE_ARGS: >-
194+
# --build=i686-pc-windows-msvc
195+
# --target=i586-pc-windows-msvc
196+
# --enable-full-tools
197+
# --enable-profiler
198+
# SCRIPT: python x.py dist
199+
# DIST_REQUIRE_ALL_TOOLS: 1
200+
# dist-i686-mingw:
201+
# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler
202+
# SCRIPT: python x.py dist
203+
# CUSTOM_MINGW: 1
204+
# DIST_REQUIRE_ALL_TOOLS: 1
205+
# dist-x86_64-mingw:
206+
# SCRIPT: python x.py dist
207+
# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler
208+
# CUSTOM_MINGW: 1
209+
# DIST_REQUIRE_ALL_TOOLS: 1
210+
211+
# "alternate" deployment, see .travis.yml for more info
212+
# dist-x86_64-msvc-alt:
213+
# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
214+
# SCRIPT: python x.py dist
215+
#
21216
# The macOS and Windows builds here are currently disabled due to them not being
22217
# overly necessary on `try` builds. We also don't actually have anything that
23218
# consumes the artifacts currently. Perhaps one day we can re-enable, but for now
@@ -32,7 +227,7 @@ jobs:
32227
# matrix:
33228
# dist-x86_64-apple:
34229
# 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
230+
# INITIAL_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
36231
# DEPLOY: 1
37232
# RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
38233
# MACOSX_DEPLOYMENT_TARGET: 10.7
@@ -42,7 +237,7 @@ jobs:
42237
#
43238
# dist-x86_64-apple-alt:
44239
# SCRIPT: ./x.py dist
45-
# RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc
240+
# INITIAL_RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc
46241
# DEPLOY_ALT: 1
47242
# RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
48243
# MACOSX_DEPLOYMENT_TARGET: 10.7
@@ -58,7 +253,7 @@ jobs:
58253
# strategy:
59254
# matrix:
60255
# dist-x86_64-msvc:
61-
# RUST_CONFIGURE_ARGS: >
256+
# INITIAL_RUST_CONFIGURE_ARGS: >
62257
# --build=x86_64-pc-windows-msvc
63258
# --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
64259
# --enable-full-tools
@@ -68,6 +263,6 @@ jobs:
68263
# DEPLOY: 1
69264
#
70265
# dist-x86_64-msvc-alt:
71-
# RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
266+
# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
72267
# SCRIPT: python x.py dist
73268
# DEPLOY_ALT: 1

0 commit comments

Comments
 (0)