ci: check examples

brofrain · Oct 27, 2023 · 96ff2cf · 96ff2cf
1 parent 4c43116
commit 96ff2cf
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/.github/workflows/review.yaml b/.github/workflows/review.yaml
@@ -27,7 +27,4 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup
-      - name: Formatting
-        run: just fmt-check
-      - name: Lint
-        run: just lint
+      - run: just ci
diff --git a/examples/csr/Cargo.toml b/examples/csr/Cargo.toml
@@ -8,7 +8,3 @@ getrandom = { version = "0.2.10", features = ["js"], optional = true }
 leptos = { version = "0.5.2", features = ["csr", "nightly"] }
 leptos_animated_for = { path = "../.." }
 rand = "0.8.5"
-
-[lints.clippy]
-pedantic = "warn"
-module-name-repetitions = "allow"
diff --git a/examples/csr/src/main.rs b/examples/csr/src/main.rs
@@ -26,7 +26,6 @@ struct Item {
 
 const INITIAL_ITEM_COUNT: usize = 40;
 
-#[allow(clippy::too_many_lines)]
 #[component]
 fn App() -> impl IntoView {
     let last_added_item_id = StoredValue::new(0);

diff --git a/examples/ssr/Cargo.toml b/examples/ssr/Cargo.toml
@@ -101,7 +101,3 @@ lib-features = ["hydrate"]
 #
 # Optional. Defaults to false.
 lib-default-features = false
-
-[lints.clippy]
-pedantic = "warn"
-module-name-repetitions = "allow"
diff --git a/justfile b/justfile
@@ -10,7 +10,7 @@ _fmt-rustfmt flag='':
 
 # Formats Leptos components using leptosfmt
 _fmt-leptosfmt flag='':
-    leptosfmt src/components/**/*.rs {{ flag }}
+    leptosfmt src/**/*.rs {{ flag }}
 
 # Formats justfile
 _fmt-justfile:
@@ -37,10 +37,31 @@ fmt-check:
     just _fmt-check-leptosfmt
     just _fmt-check-justfile
 
+# Checks examples formatting
+fmt-check-examples:
+    #!/usr/bin/env sh
+    (cd examples/csr && just _fmt-check-rustfmt)
+    (cd examples/csr && just _fmt-check-leptosfmt)
+    (cd examples/ssr && just _fmt-check-rustfmt)
+    (cd examples/ssr && just _fmt-check-leptosfmt)
+
 # Lints source with Clippy
 lint:
     cargo clippy -- -D warnings
 
+# Lints examples with Clippy
+lint-examples:
+    #!/usr/bin/env sh
+    (cd examples/csr && cargo clippy -- -D warnings)
+    (cd examples/ssr && cargo clippy --features ssr -- -D warnings)
+    (cd examples/ssr && cargo clippy --lib --features hydrate -- -D warnings)
+
+ci:
+    just fmt-check
+    just lint
+    just fmt-check-examples
+    just lint-examples
+
 _vscode-fmt:
     # Using `leptosfmt --stdin --rustfmt` seems to add redundant newlines
     leptosfmt --stdin | rustfmt