about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-12-24 13:37:08 +0000
committerbors <bors@rust-lang.org>2020-12-24 13:37:08 +0000
commit02399f4b25d549b54973e0ff1a15fd5fcb37e2cc (patch)
tree1f9b9979c55570dff3ac9c9fd13d4111c58d670f
parent5c981359a8ef753e87978d0323ba0eaf7def0769 (diff)
parent2218dd65547bb5a16efe61b03c04285d2691bbb0 (diff)
downloadrust-02399f4b25d549b54973e0ff1a15fd5fcb37e2cc.tar.gz
rust-02399f4b25d549b54973e0ff1a15fd5fcb37e2cc.zip
Auto merge of #6504 - matthiaskrgr:cifix, r=matthiaskrgr
fix ci on master branch; run the --fix test in the correct directory

Turned out the --fix test was run in the wrong directory.

*Please write a short comment explaining your change (or "none" for internal only changes)*
changelog: none
-rw-r--r--.github/workflows/clippy.yml7
1 files changed, 3 insertions, 4 deletions
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index 17812b74ab2..9d5e12aac5f 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -50,6 +50,9 @@ jobs:
     - name: Build
       run: cargo build --features deny-warnings,internal-lints
 
+    - name: Test "--fix -Zunstable-options"
+      run: cargo run --features deny-warnings,internal-lints --bin cargo-clippy -- clippy --fix -Zunstable-options
+
     - name: Test
       run: cargo test --features deny-warnings,internal-lints
 
@@ -57,10 +60,6 @@ jobs:
       run: cargo test --features deny-warnings,internal-lints
       working-directory: clippy_lints
 
-    - name: Test --fix -Zunstable-options
-      run: cargo run --bin cargo-clippy -- clippy --fix -Zunstable-options
-      working-directory: clippy_lints
-
     - name: Test rustc_tools_util
       run: cargo test --features deny-warnings
       working-directory: rustc_tools_util