remove litns

ameknite · Nov 17, 2023 · 0448a73 · 0448a73
1 parent 60ae968
commit 0448a73
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,24 +42,24 @@ jobs:
   #         RUSTFLAGS: "-C debuginfo=0 -D warnings"
 
   ci:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
-      # - uses: actions/cache@v3
-      #   with:
-      #     path: |
-      #       ~/.cargo/bin/
-      #       ~/.cargo/registry/index/
-      #       ~/.cargo/registry/cache/
-      #       ~/.cargo/git/db/
-      #       target/
-      #     key: ${{ runner.os }}-cargo-ci-${{ hashFiles('**/Cargo.toml') }}
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-ci-${{ hashFiles('**/Cargo.toml') }}
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt, clippy
-      # - name: Install alsa and udev
-      #   run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
+      - name: Install alsa and udev
+        run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
       - name: CI job
         # See tools/ci/src/main.rs for the commands this runs
         run: cargo run -p ci -- lints

diff --git a/tools/ci/src/main.rs b/tools/ci/src/main.rs
@@ -17,14 +17,14 @@ bitflags! {
     }
 }
 
-const CLIPPY_FLAGS: [&str; 6] = [
-    "-Wclippy::doc_markdown",
-    "-Wclippy::redundant_else",
-    "-Wclippy::match_same_arms",
-    "-Wclippy::semicolon_if_nothing_returned",
-    "-Wclippy::map_flatten",
-    "-Dwarnings",
-];
+// const CLIPPY_FLAGS: [&str; 6] = [
+//     "-Wclippy::doc_markdown",
+//     "-Wclippy::redundant_else",
+//     "-Wclippy::match_same_arms",
+//     "-Wclippy::semicolon_if_nothing_returned",
+//     "-Wclippy::map_flatten",
+//     "-Dwarnings",
+// ];
 
 fn main() {
     // When run locally, results may differ from actual CI runs triggered by
@@ -80,7 +80,7 @@ fn main() {
         // - Type complexity must be ignored because we use huge templates for queries
         cmd!(
             sh,
-            "cargo clippy --workspace --all-targets --all-features -- {CLIPPY_FLAGS...}"
+            "cargo clippy --workspace --all-targets --all-features -- -Dwarnings"
         )
         .run()
         .expect("Please fix clippy errors in output above.");