Skip to content

Commit a8edf26

Browse files
committed
move './miri check' for features to the style check job
1 parent 660a571 commit a8edf26

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

src/tools/miri/.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@ jobs:
130130
run: ./miri fmt --check
131131
- name: clippy
132132
run: ./miri clippy -- -D warnings
133+
- name: clippy (no features)
134+
run: ./miri clippy --no-default-features -- -D warnings
135+
- name: clippy (all features)
136+
run: ./miri clippy --all-features -- -D warnings
133137
- name: rustdoc
134138
run: RUSTDOCFLAGS="-Dwarnings" ./miri cargo doc --document-private-items
135139

src/tools/miri/ci/ci.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,15 @@ export RUSTFLAGS="-D warnings"
2727
export CARGO_INCREMENTAL=0
2828
export CARGO_EXTRA_FLAGS="--locked"
2929

30-
# Determine configuration for installed build
30+
# Determine configuration for installed build (used by test-cargo-miri).
3131
echo "Installing release version of Miri"
32-
./miri install
33-
34-
echo "Checking various feature flag configurations"
35-
./miri check --no-default-features # make sure this can be built
36-
./miri check # and this, too
37-
# `--all-features` is used for the build below, so no extra check needed.
32+
time ./miri install
3833

3934
# Prepare debug build for direct `./miri` invocations.
4035
# We enable all features to make sure the Stacked Borrows consistency check runs.
4136
echo "Building debug version of Miri"
4237
export CARGO_EXTRA_FLAGS="$CARGO_EXTRA_FLAGS --all-features"
43-
./miri build --all-targets # the build that all the `./miri test` below will use
38+
time ./miri build --all-targets # the build that all the `./miri test` below will use
4439

4540
endgroup
4641

0 commit comments

Comments
 (0)