Skip to content

Commit 1add455

Browse files
borsbors
committed
Auto merge of #69894 - vtbassmatt:master, r=nellshamrell
establish immutable source for RUST_CONFIGURE_ARGS fixes #68671
2 parents 9d0ae58 + 6db4bb6 commit 1add455

File tree

3 files changed

+36
-23
lines changed

3 files changed

+36
-23
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+
INITIAL_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

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
# matrix:
3333
# dist-x86_64-apple:
3434
# 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
35+
# 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
3636
# DEPLOY: 1
3737
# RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
3838
# MACOSX_DEPLOYMENT_TARGET: 10.7
@@ -42,7 +42,7 @@ jobs:
4242
#
4343
# dist-x86_64-apple-alt:
4444
# SCRIPT: ./x.py dist
45-
# RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc
45+
# INITIAL_RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc
4646
# DEPLOY_ALT: 1
4747
# RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
4848
# MACOSX_DEPLOYMENT_TARGET: 10.7
@@ -58,7 +58,7 @@ jobs:
5858
# strategy:
5959
# matrix:
6060
# dist-x86_64-msvc:
61-
# RUST_CONFIGURE_ARGS: >
61+
# INITIAL_RUST_CONFIGURE_ARGS: >
6262
# --build=x86_64-pc-windows-msvc
6363
# --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
6464
# --enable-full-tools
@@ -68,6 +68,6 @@ jobs:
6868
# DEPLOY: 1
6969
#
7070
# dist-x86_64-msvc-alt:
71-
# RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
71+
# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
7272
# SCRIPT: python x.py dist
7373
# DEPLOY_ALT: 1

‎src/ci/scripts/setup-environment.sh

+13
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,19 @@ IFS=$'\n\t'
88

99
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
1010

11+
# Since matrix variables are readonly in Azure Pipelines, we take
12+
# INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS
13+
# which downstream steps can alter
14+
# macOS ships with Bash 3.16, so we cannot use [[ -v FOO ]],
15+
# which was introduced in Bash 4.2
16+
if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS+x}" ]]; then
17+
INITIAL_RUST_CONFIG=""
18+
echo "No initial Rust configure args set"
19+
else
20+
INITIAL_RUST_CONFIG="${INITIAL_RUST_CONFIGURE_ARGS}"
21+
ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIG}"
22+
fi
23+
1124
# Builders starting with `dist-` are dist builders, but if they also end with
1225
# `-alt` they are alternate dist builders.
1326
if [[ "${CI_JOB_NAME}" = dist-* ]]; then

0 commit comments

Comments
 (0)