diff options
| author | Joshua Nelson <github@jyn.dev> | 2022-12-31 01:02:10 +0000 |
|---|---|---|
| committer | Joshua Nelson <github@jyn.dev> | 2023-01-01 21:44:18 +0000 |
| commit | beefcf88544b7f4d1b5e9ae77f93566303d34326 (patch) | |
| tree | 93d93b4e608d231b1bbcb358a174555b76f15db4 | |
| parent | 77429957a0e9c90a26c89def061ffdd4bae5ccb9 (diff) | |
| download | rust-beefcf88544b7f4d1b5e9ae77f93566303d34326.tar.gz rust-beefcf88544b7f4d1b5e9ae77f93566303d34326.zip | |
Cleanup `mingw-tidy` docker job
- 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.
| -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 |