t

.github/driver.sh

@@ -2,9 +2,17 @@
 
 set -ex
 
+sysroot="$(rustc --print sysroot)"
+if [[ $OS == "Windows" ]]; then
+    export PATH="$(cygpath "$sysroot")/bin:$PATH"
+elif [[ $OS == "macOS" ]]; then
+    export DYLD_FALLBACK_LIBRARY_PATH="$sysroot/lib"
+else
+    export LD_LIBRARY_PATH="$sysroot/lib"
+fi
+
 # Check sysroot handling
-sysroot=$(./target/debug/clippy-driver --print sysroot)
-test "$sysroot" = "$(rustc --print sysroot)"
+test "$(./target/debug/clippy-driver --print sysroot)" = "$sysroot"
 
 if [[ ${OS} == "Windows" ]]; then
 	desired_sysroot=C:/tmp

.github/workflows/clippy.yml

@@ -69,6 +69,6 @@ jobs:
       working-directory: clippy_dev
 
     - name: Test clippy-driver
-      run: |
-        TOOLCHAIN=$(rustup show active-toolchain | cut -f1 -d' ')
-        rustup run $TOOLCHAIN bash .github/driver.sh
+      run: bash .github/driver.sh
+      env:
+        OS: ${{ runner.os }}

.github/workflows/clippy_bors.yml

@@ -2,9 +2,6 @@ name: Clippy Test (bors)
 
 on:
   push:
-    branches:
-      - auto
-      - try
 
 env:
   RUST_BACKTRACE: 1
@@ -22,35 +19,7 @@ defaults:
     shell: bash
 
 jobs:
-  changelog:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ github.ref }}
-
-    # Run
-    - name: Check Changelog
-      run: |
-        MESSAGE=$(git log --format=%B -n 1)
-        PR=$(echo "$MESSAGE" | grep -o "#[0-9]*" | head -1 | sed -e 's/^#//')
-        body=$(curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -s "https://api.github.com/repos/rust-lang/rust-clippy/pulls/$PR" | \
-          python -c "import sys, json; print(json.load(sys.stdin)['body'])")
-        output=$(grep "^changelog:\s*\S" <<< "$body" | sed "s/changelog:\s*//g") || {
-          echo "ERROR: PR body must contain 'changelog: ...'"
-          exit 1
-        }
-        if [[ "$output" = "none" ]]; then
-          echo "WARNING: changelog is 'none'"
-        else
-          echo "changelog: $output"
-        fi
-      env:
-        PYTHONIOENCODING: 'utf-8'
   base:
-    needs: changelog
     strategy:
       matrix:
         include:
@@ -87,165 +56,7 @@ jobs:
     - name: Build
       run: cargo build --tests --features deny-warnings,internal
 
-    - name: Test
-      if: matrix.host == 'x86_64-unknown-linux-gnu'
-      run: cargo test --features deny-warnings,internal
-
-    - name: Test
-      if: matrix.host != 'x86_64-unknown-linux-gnu'
-      run: cargo test --features deny-warnings,internal -- --skip dogfood
-
-    - name: Test clippy_lints
-      run: cargo test --features deny-warnings,internal
-      working-directory: clippy_lints
-
-    - name: Test clippy_utils
-      run: cargo test --features deny-warnings
-      working-directory: clippy_utils
-
-    - name: Test clippy_config
-      run: cargo test --features deny-warnings
-      working-directory: clippy_config
-
-    - name: Test rustc_tools_util
-      run: cargo test --features deny-warnings
-      working-directory: rustc_tools_util
-
-    - name: Test clippy_dev
-      run: cargo test --features deny-warnings
-      working-directory: clippy_dev
-
     - name: Test clippy-driver
-      run: |
-        TOOLCHAIN=$(rustup show active-toolchain | cut -f1 -d' ')
-        rustup run $TOOLCHAIN bash .github/driver.sh
+      run: bash .github/driver.sh
       env:
         OS: ${{ runner.os }}
-
-  metadata_collection:
-    needs: changelog
-    runs-on: ubuntu-latest
-
-    steps:
-     # Setup
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Install toolchain
-      run: rustup show active-toolchain
-
-    - name: Test metadata collection
-      run: cargo collect-metadata
-
-    - name: Test lint_configuration.md is up-to-date
-      run: |
-        echo "run \`cargo collect-metadata\` if this fails"
-        git update-index --refresh
-
-  integration_build:
-    needs: changelog
-    runs-on: ubuntu-latest
-
-    steps:
-    # Setup
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Install toolchain
-      run: rustup show active-toolchain
-
-    # Run
-    - name: Build Integration Test
-      env:
-        CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: off
-      run: cargo test --test integration --features integration --no-run
-
-    # Upload
-    - name: Extract Binaries
-      run: |
-        DIR=$CARGO_TARGET_DIR/debug
-        find $DIR/deps/integration-* -executable ! -type d | xargs -I {} mv {} $DIR/integration
-        find $DIR ! -executable -o -type d ! -path $DIR | xargs rm -rf
-
-    - name: Upload Binaries
-      uses: actions/upload-artifact@v3
-      with:
-        name: binaries
-        path: target/debug
-
-  integration:
-    needs: integration_build
-    strategy:
-      fail-fast: false
-      max-parallel: 6
-      matrix:
-        integration:
-        - 'matthiaskrgr/clippy_ci_panic_test'
-        - 'rust-lang/cargo'
-        - 'rust-lang/chalk'
-        - 'rust-lang/rustfmt'
-        - 'Marwes/combine'
-        - 'Geal/nom'
-        - 'rust-lang/stdarch'
-        - 'serde-rs/serde'
-        - 'chronotope/chrono'
-        - 'hyperium/hyper'
-        - 'rust-random/rand'
-        - 'rust-lang/futures-rs'
-        - 'rust-itertools/itertools'
-        - 'rust-lang-nursery/failure'
-        - 'rust-lang/log'
-
-    runs-on: ubuntu-latest
-
-    steps:
-    # Setup
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Install toolchain
-      run: rustup show active-toolchain
-
-    # Download
-    - name: Download target dir
-      uses: actions/download-artifact@v3
-      with:
-        name: binaries
-        path: target/debug
-
-    - name: Make Binaries Executable
-      run: chmod +x $CARGO_TARGET_DIR/debug/*
-
-    # Run
-    - name: Test ${{ matrix.integration }}
-      run: |
-          TOOLCHAIN=$(rustup show active-toolchain | cut -f1 -d' ')
-          rustup run $TOOLCHAIN $CARGO_TARGET_DIR/debug/integration --show-output
-      env:
-        INTEGRATION: ${{ matrix.integration }}
-
-  # These jobs doesn't actually test anything, but they're only used to tell
-  # bors the build completed, as there is no practical way to detect when a
-  # workflow is successful listening to webhooks only.
-  #
-  # ALL THE PREVIOUS JOBS NEED TO BE ADDED TO THE `needs` SECTION OF THIS JOB!
-
-  end-success:
-    name: bors test finished
-    if: github.event.pusher.name == 'bors' && success()
-    runs-on: ubuntu-latest
-    needs: [changelog, base, metadata_collection, integration_build, integration]
-
-    steps:
-      - name: Mark the job as successful
-        run: exit 0
-
-  end-failure:
-    name: bors test finished
-    if: github.event.pusher.name == 'bors' && (failure() || cancelled())
-    runs-on: ubuntu-latest
-    needs: [changelog, base, metadata_collection, integration_build, integration]
-
-    steps:
-      - name: Mark the job as a failure
-        run: exit 1