X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.github%2Fworkflows%2Fclippy.yml;h=b4bd9f540bd1bf36a5c90c995b71a48b289adee0;hb=813d3192bb0267ba2971ab85c115d52119848ff5;hp=7997344aabd0dee333f17a027bd3405fc8271b5d;hpb=b9580fcef7a564fedf93e8f2237a089cd9b36fee;p=rust.git

diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index 7997344aabd..b4bd9f540bd 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -37,13 +37,17 @@ jobs:
         toolchain: nightly
         target: x86_64-unknown-linux-gnu
         profile: minimal
+    - name: Checkout
+      uses: actions/checkout@v2.0.0
+    - name: Run cargo update
+      run: cargo update
     - name: Cache cargo dir
       uses: actions/cache@v1
       with:
         path: ~/.cargo
-        key: ${{ runner.os }}-x86_64-unknown-linux-gnu
-    - name: Checkout
-      uses: actions/checkout@v2.0.0
+        key: ${{ runner.os }}-x86_64-unknown-linux-gnu-${{ hashFiles('Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-x86_64-unknown-linux-gnu
     - name: Master Toolchain Setup
       run: bash setup-toolchain.sh
 
@@ -68,31 +72,9 @@ jobs:
       run: ../target/debug/cargo-clippy
       working-directory: clippy_workspace_tests
     - name: Test clippy-driver
-      run: |
-        (
-          set -ex
-          # Check sysroot handling
-          sysroot=$(./target/debug/clippy-driver --print sysroot)
-          test "$sysroot" = "$(rustc --print sysroot)"
-
-          desired_sysroot=/tmp
-          sysroot=$(./target/debug/clippy-driver --sysroot $desired_sysroot --print sysroot)
-          test "$sysroot" = $desired_sysroot
-
-          sysroot=$(SYSROOT=$desired_sysroot ./target/debug/clippy-driver --print sysroot)
-          test "$sysroot" = $desired_sysroot
-
-          # Make sure this isn't set - clippy-driver should cope without it
-          unset CARGO_MANIFEST_DIR
-
-          # Run a lint and make sure it produces the expected output. It's also expected to exit with code 1
-          # FIXME: How to match the clippy invocation in compile-test.rs?
-          ./target/debug/clippy-driver -Dwarnings -Aunused -Zui-testing --emit metadata --crate-type bin tests/ui/cstring.rs 2> cstring.stderr && exit 1
-          sed -e 's,tests/ui,$DIR,' -e '/= help/d' cstring.stderr > normalized.stderr
-          diff normalized.stderr tests/ui/cstring.stderr
-
-          # TODO: CLIPPY_CONF_DIR / CARGO_MANIFEST_DIR
-        )
+      run: bash .github/driver.sh
+      env:
+        OS: ${{ runner.os }}
 
     - name: Run cargo-cache --autoclean
       run: |