throw in the towel for clippy on linux with falcon features

oxidecomputer · Dec 5, 2023 · 1a5ea36 · 1a5ea36
1 parent a11fdd1
commit 1a5ea36
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/.github/buildomat/jobs/falcon-build.sh b/.github/buildomat/jobs/falcon-build.sh
@@ -18,6 +18,7 @@ rustc --version
 
 banner check
 ptime -m cargo check --features falcon
+ptime -m cargo xtask clippy
 
 banner build
 ptime -m cargo build --features falcon --release \

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -28,7 +28,6 @@ jobs:
     - uses: dtolnay/rust-toolchain@439cf607258077187679211f12aa6f19af4a0af7 # master @ 2023-10-08
       with:
         toolchain: stable
-        target: x86_64-unknown-illumos
     - name: Report clippy version
       run: cargo clippy -- --version
     - name: Check clippy

diff --git a/xtask/src/task_clippy.rs b/xtask/src/task_clippy.rs
@@ -39,16 +39,17 @@ pub(crate) fn cmd_clippy(strict: bool, quiet: bool) -> Result<()> {
         run_clippy(&["-p", "propolis-server", "--features", "omicron-build"])?;
 
     // Check the Falcon bits
-    failed |= run_clippy(&[
-        "--features",
-        "falcon",
-        "-p",
-        "propolis-server",
-        "-p",
-        "propolis-client",
-        "--target",
-        "x86_64-unknown-illumos",
-    ])?;
+    #[cfg(target_os = "illumos")]
+    {
+        failed |= run_clippy(&[
+            "--features",
+            "falcon",
+            "-p",
+            "propolis-server",
+            "-p",
+            "propolis-client",
+        ])?;
+    }
 
     // Check the mock server
     failed |= run_clippy(&["-p", "propolis-mock-server"])?;