about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Krones <hello@philkrones.com>2025-03-22 12:23:32 +0000
committerGitHub <noreply@github.com>2025-03-22 12:23:32 +0000
commitd5a6688092ed582b281fcff93cb8256b816e91c7 (patch)
tree03187eed4dd1f295ae86bac5d09d3e064036e67e
parent0a141ab7b882387528eac4140df67e9938e5d257 (diff)
parente1d6f1fc5ca8ec2a69033a7c506a0a7a824fc8e8 (diff)
downloadrust-d5a6688092ed582b281fcff93cb8256b816e91c7.tar.gz
rust-d5a6688092ed582b281fcff93cb8256b816e91c7.zip
Use a lintcheck specific Clippy configuration file in the CI (#14233)
By default, lintcheck will use the `clippy.toml` file found at the
toplevel of the repository (`CARGO_MANIFEST_DIR`). This file is meant
for configuration of Clippy applied to Clippy sources.

This creates a new `lintcheck/ci-config/clippy.toml` file which is used
by the CI when running lintcheck. By default this uses the default
Clippy configuration.

changelog: none
-rw-r--r--.github/workflows/lintcheck.yml4
-rw-r--r--lintcheck/ci-config/clippy.toml6
2 files changed, 8 insertions, 2 deletions
diff --git a/.github/workflows/lintcheck.yml b/.github/workflows/lintcheck.yml
index d487c7d9498..70c805903d3 100644
--- a/.github/workflows/lintcheck.yml
+++ b/.github/workflows/lintcheck.yml
@@ -66,7 +66,7 @@ jobs:
 
     - name: Run lintcheck
       if: steps.cache-json.outputs.cache-hit != 'true'
-      run: ./target/debug/lintcheck --format json --all-lints --crates-toml ./lintcheck/ci_crates.toml
+      run: env CLIPPY_CONF_DIR="$PWD/lintcheck/ci-config" ./target/debug/lintcheck --format json --all-lints --crates-toml ./lintcheck/ci_crates.toml
 
     - name: Upload base JSON
       uses: actions/upload-artifact@v4
@@ -97,7 +97,7 @@ jobs:
       run: cargo build --manifest-path=lintcheck/Cargo.toml
 
     - name: Run lintcheck
-      run: ./target/debug/lintcheck --format json --all-lints --crates-toml ./lintcheck/ci_crates.toml
+      run: env CLIPPY_CONF_DIR="$PWD/lintcheck/ci-config" ./target/debug/lintcheck --format json --all-lints --crates-toml ./lintcheck/ci_crates.toml
 
     - name: Upload head JSON
       uses: actions/upload-artifact@v4
diff --git a/lintcheck/ci-config/clippy.toml b/lintcheck/ci-config/clippy.toml
new file mode 100644
index 00000000000..d9eb2ef90db
--- /dev/null
+++ b/lintcheck/ci-config/clippy.toml
@@ -0,0 +1,6 @@
+# Configuration applied when running lintcheck from the CI
+#
+# The CI will set the `CLIPPY_CONF_DIR` environment variable
+# to `$PWD/lintcheck/ci-config`.
+
+avoid-breaking-exported-api = false