Skip to content

Commit 0f50014

Browse files
authored
Rollup merge of rust-lang#106315 - jyn514:cleanup-mingw-tidy, r=fee1-dead
Cleanup `mingw-tidy` docker job Fixes a couple small regressions from rust-lang#106048 and rust-lang#105714. - Avoid `/checkout/src/ci/run.sh: line 187: [: =: unary operator expected`: https://github.com/rust-lang/rust/actions/runs/3809902408/jobs/6481611301#step:26:1701 - Avoid running `x check` in the tidy test, to get faster feedback. It's already run on the normal `mingw-check` job. r? `@fee1-dead`
2 parents abeed83 + 4822f42 commit 0f50014

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
3232
COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
3333
COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
3434

35-
ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
3635
ENV SCRIPT python3 ../x.py test --stage 0 src/tools/tidy

src/ci/run.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,11 @@ if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then
184184
$SRC/configure --set rust.parallel-compiler
185185

186186
# Save the build metrics before we wipe the directory
187-
if [ $HAS_METRICS = 1 ]; then
187+
if [ "$HAS_METRICS" = 1 ]; then
188188
mv build/metrics.json .
189189
fi
190190
rm -rf build
191-
if [ $HAS_METRICS = 1 ]; then
191+
if [ "$HAS_METRICS" = 1 ]; then
192192
mkdir build
193193
mv metrics.json build
194194
fi

0 commit comments

Comments
 (0)