diff options
| author | Michael Goulet <michael@errs.io> | 2023-01-02 15:39:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-02 15:39:17 -0800 |
| commit | 0670a6151c4731d63e0eff1939534c7ca2af5ec6 (patch) | |
| tree | 4f0d68d3dc7b3f174322fab9b5d494ea4b2f5769 | |
| parent | fbffaa91ada6387cdea184dcd1d689762b3e8927 (diff) | |
| parent | beefcf88544b7f4d1b5e9ae77f93566303d34326 (diff) | |
| download | rust-0670a6151c4731d63e0eff1939534c7ca2af5ec6.tar.gz rust-0670a6151c4731d63e0eff1939534c7ca2af5ec6.zip | |
Rollup merge of #106315 - jyn514:cleanup-mingw-tidy, r=fee1-dead
Cleanup `mingw-tidy` docker job Fixes a couple small regressions from https://github.com/rust-lang/rust/pull/106048 and https://github.com/rust-lang/rust/pull/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`
| -rw-r--r-- | src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile | 1 | ||||
| -rwxr-xr-x | src/ci/run.sh | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile b/src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile index c340294fc73..dc0e591cad6 100644 --- a/src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile +++ b/src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile @@ -32,5 +32,4 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/ COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/ -ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1 ENV SCRIPT python3 ../x.py test --stage 0 src/tools/tidy tidyselftest diff --git a/src/ci/run.sh b/src/ci/run.sh index b6430027750..0db9c993eec 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -184,11 +184,11 @@ if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then $SRC/configure --set rust.parallel-compiler # Save the build metrics before we wipe the directory - if [ $HAS_METRICS = 1 ]; then + if [ "$HAS_METRICS" = 1 ]; then mv build/metrics.json . fi rm -rf build - if [ $HAS_METRICS = 1 ]; then + if [ "$HAS_METRICS" = 1 ]; then mkdir build mv metrics.json build fi |