Skip to content

Commit af6b266

Browse files
pietroalbinipietroalbini
committed
ci: remove the MSYS_BITS env var
1 parent 53c2c04 commit af6b266

File tree

4 files changed

+28
-36
lines changed

4 files changed

+28
-36
lines changed

‎src/ci/azure-pipelines/auto.yml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -223,37 +223,31 @@ jobs:
223223
matrix:
224224
# 32/64 bit MSVC tests
225225
x86_64-msvc-1:
226-
MSYS_BITS: 64
227226
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
228227
SCRIPT: make ci-subset-1
229228
# FIXME(#59637)
230229
NO_DEBUG_ASSERTIONS: 1
231230
NO_LLVM_ASSERTIONS: 1
232231
x86_64-msvc-2:
233-
MSYS_BITS: 64
234232
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
235233
SCRIPT: make ci-subset-2
236234
i686-msvc-1:
237-
MSYS_BITS: 32
238235
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
239236
SCRIPT: make ci-subset-1
240237
# FIXME(#59637)
241238
NO_DEBUG_ASSERTIONS: 1
242239
NO_LLVM_ASSERTIONS: 1
243240
i686-msvc-2:
244-
MSYS_BITS: 32
245241
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
246242
SCRIPT: make ci-subset-2
247243
# FIXME(#59637)
248244
NO_DEBUG_ASSERTIONS: 1
249245
NO_LLVM_ASSERTIONS: 1
250246
# MSVC aux tests
251247
x86_64-msvc-aux:
252-
MSYS_BITS: 64
253248
RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1
254249
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
255250
x86_64-msvc-cargo:
256-
MSYS_BITS: 64
257251
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
258252
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
259253
VCVARS_BAT: vcvars64.bat
@@ -262,10 +256,8 @@ jobs:
262256
NO_LLVM_ASSERTIONS: 1
263257
# MSVC tools tests
264258
x86_64-msvc-tools:
265-
MSYS_BITS: 64
266259
SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
267260
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json
268-
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
269261

270262
# 32/64-bit MinGW builds.
271263
#
@@ -281,35 +273,30 @@ jobs:
281273
# came from the mingw-w64 SourceForge download site. Unfortunately
282274
# SourceForge is notoriously flaky, so we mirror it on our own infrastructure.
283275
i686-mingw-1:
284-
MSYS_BITS: 32
285276
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
286277
SCRIPT: make ci-mingw-subset-1
287278
CUSTOM_MINGW: 1
288279
# FIXME(#59637)
289280
NO_DEBUG_ASSERTIONS: 1
290281
NO_LLVM_ASSERTIONS: 1
291282
i686-mingw-2:
292-
MSYS_BITS: 32
293283
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
294284
SCRIPT: make ci-mingw-subset-2
295285
CUSTOM_MINGW: 1
296286
x86_64-mingw-1:
297-
MSYS_BITS: 64
298287
SCRIPT: make ci-mingw-subset-1
299288
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
300289
CUSTOM_MINGW: 1
301290
# FIXME(#59637)
302291
NO_DEBUG_ASSERTIONS: 1
303292
NO_LLVM_ASSERTIONS: 1
304293
x86_64-mingw-2:
305-
MSYS_BITS: 64
306294
SCRIPT: make ci-mingw-subset-2
307295
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
308296
CUSTOM_MINGW: 1
309297

310298
# 32/64 bit MSVC and GNU deployment
311299
dist-x86_64-msvc:
312-
MSYS_BITS: 64
313300
RUST_CONFIGURE_ARGS: >-
314301
--build=x86_64-pc-windows-msvc
315302
--target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
@@ -319,7 +306,6 @@ jobs:
319306
DIST_REQUIRE_ALL_TOOLS: 1
320307
DEPLOY: 1
321308
dist-i686-msvc:
322-
MSYS_BITS: 32
323309
RUST_CONFIGURE_ARGS: >-
324310
--build=i686-pc-windows-msvc
325311
--target=i586-pc-windows-msvc
@@ -329,14 +315,12 @@ jobs:
329315
DIST_REQUIRE_ALL_TOOLS: 1
330316
DEPLOY: 1
331317
dist-i686-mingw:
332-
MSYS_BITS: 32
333318
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler
334319
SCRIPT: python x.py dist
335320
CUSTOM_MINGW: 1
336321
DIST_REQUIRE_ALL_TOOLS: 1
337322
DEPLOY: 1
338323
dist-x86_64-mingw:
339-
MSYS_BITS: 64
340324
SCRIPT: python x.py dist
341325
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler
342326
CUSTOM_MINGW: 1
@@ -345,7 +329,6 @@ jobs:
345329

346330
# "alternate" deployment, see .travis.yml for more info
347331
dist-x86_64-msvc-alt:
348-
MSYS_BITS: 64
349332
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
350333
SCRIPT: python x.py dist
351334
DEPLOY_ALT: 1

‎src/ci/azure-pipelines/steps/run.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88

99
steps:
1010

11+
# Configure our CI_JOB_NAME variable which log analyzers can use for the main
12+
# step to see what's going on.
13+
- bash: |
14+
builder=$(echo $AGENT_JOBNAME | cut -d ' ' -f 2)
15+
echo "##vso[task.setvariable variable=CI_JOB_NAME]$builder"
16+
displayName: Configure Job Name
17+
1118
# Disable automatic line ending conversion, which is enabled by default on
1219
# Azure's Windows image. Having the conversion enabled caused regressions both
1320
# in our test suite (it broke miri tests) and in the ecosystem, since we
@@ -135,13 +142,6 @@ steps:
135142
condition: and(succeeded(), not(variables.SKIP_JOB))
136143
displayName: Install awscli
137144

138-
# Configure our CI_JOB_NAME variable which log analyzers can use for the main
139-
# step to see what's going on.
140-
- bash: |
141-
builder=$(echo $AGENT_JOBNAME | cut -d ' ' -f 2)
142-
echo "##vso[task.setvariable variable=CI_JOB_NAME]$builder"
143-
displayName: Configure Job Name
144-
145145
# As a quick smoke check on the otherwise very fast mingw-check linux builder
146146
# check our own internal scripts.
147147
- bash: |

‎src/ci/azure-pipelines/try.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ jobs:
7272
# DEPLOY: 1
7373
#
7474
# dist-x86_64-msvc-alt:
75-
# MSYS_BITS: 64
7675
# RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
7776
# SCRIPT: python x.py dist
7877
# DEPLOY_ALT: 1

‎src/ci/scripts/install-mingw.sh‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,34 @@ MINGW_ARCHIVE_32="i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z"
3131
MINGW_ARCHIVE_64="x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z"
3232

3333
if isWindows; then
34+
case "${CI_JOB_NAME}" in
35+
*i686*)
36+
bits=32
37+
arch=i686
38+
mingw_archive="${MINGW_ARCHIVE_32}"
39+
;;
40+
*x86_64*)
41+
bits=64
42+
arch=x86_64
43+
mingw_archive="${MINGW_ARCHIVE_64}"
44+
;;
45+
*)
46+
echo "src/ci/scripts/install-mingw.sh can't detect the builder's architecture"
47+
echo "please tweak it to recognize the builder named '${CI_JOB_NAME}'"
48+
exit 1
49+
;;
50+
esac
51+
3452
if [[ "${CUSTOM_MINGW-0}" -ne 1 ]]; then
35-
arch=i686
36-
if [ "$MSYS_BITS" = "64" ]; then
37-
arch=x86_64
38-
fi
3953
pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
4054
mingw-w64-$arch-gcc mingw-w64-$arch-python2
41-
ciCommandAddPath "${SYSTEM_WORKFOLDER}/msys2/mingw${MSYS_BITS}/bin"
55+
ciCommandAddPath "${SYSTEM_WORKFOLDER}/msys2/mingw${bits}/bin"
4256
else
43-
mingw_archive="${MINGW_ARCHIVE_32}"
44-
if [[ "${MSYS_BITS}" = "64" ]]; then
45-
mingw_archive="${MINGW_ARCHIVE_64}"
46-
fi
47-
mingw_dir="mingw${MSYS_BITS}"
57+
mingw_dir="mingw${bits}"
4858

4959
curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
5060
7z x -y mingw.7z > /dev/null
51-
curl -o "${mingw_dir}/bin/gdborig.exe" "${MIRRORS_BASE}/2017-04-20-${MSYS_BITS}bit-gdborig.exe"
61+
curl -o "${mingw_dir}/bin/gdborig.exe" "${MIRRORS_BASE}/2017-04-20-${bits}bit-gdborig.exe"
5262
ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
5363
fi
5464
fi

0 commit comments

Comments
 (0)