From a8edf26a61158c5074ce121dd3c65d5a9509eb38 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 31 Mar 2024 10:44:18 +0200 Subject: [PATCH] move './miri check' for features to the style check job --- src/tools/miri/.github/workflows/ci.yml | 4 ++++ src/tools/miri/ci/ci.sh | 11 +++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/tools/miri/.github/workflows/ci.yml b/src/tools/miri/.github/workflows/ci.yml index 2c5868d5b37a..c5979e18a3b5 100644 --- a/src/tools/miri/.github/workflows/ci.yml +++ b/src/tools/miri/.github/workflows/ci.yml @@ -130,6 +130,10 @@ jobs: run: ./miri fmt --check - name: clippy run: ./miri clippy -- -D warnings + - name: clippy (no features) + run: ./miri clippy --no-default-features -- -D warnings + - name: clippy (all features) + run: ./miri clippy --all-features -- -D warnings - name: rustdoc run: RUSTDOCFLAGS="-Dwarnings" ./miri cargo doc --document-private-items diff --git a/src/tools/miri/ci/ci.sh b/src/tools/miri/ci/ci.sh index 2cd918fc2b15..32b58547d7c2 100755 --- a/src/tools/miri/ci/ci.sh +++ b/src/tools/miri/ci/ci.sh @@ -27,20 +27,15 @@ export RUSTFLAGS="-D warnings" export CARGO_INCREMENTAL=0 export CARGO_EXTRA_FLAGS="--locked" -# Determine configuration for installed build +# Determine configuration for installed build (used by test-cargo-miri). echo "Installing release version of Miri" -./miri install - -echo "Checking various feature flag configurations" -./miri check --no-default-features # make sure this can be built -./miri check # and this, too -# `--all-features` is used for the build below, so no extra check needed. +time ./miri install # Prepare debug build for direct `./miri` invocations. # We enable all features to make sure the Stacked Borrows consistency check runs. echo "Building debug version of Miri" export CARGO_EXTRA_FLAGS="$CARGO_EXTRA_FLAGS --all-features" -./miri build --all-targets # the build that all the `./miri test` below will use +time ./miri build --all-targets # the build that all the `./miri test` below will use endgroup