ci: improve workflows (#120)

DanielleHuisman · web-flow · commit f477b67fcb66 · 2025-08-25T19:53:23.000+02:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,7 +37,6 @@ jobs:
             - name: Set up Rust toolchain
               uses: actions-rust-lang/setup-rust-toolchain@v1
               with:
-                  components: clippy, rustfmt
                   target: wasm32-unknown-unknown
 
             - name: Install Cargo Binary Install
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -23,7 +23,6 @@ jobs:
             - name: Set up Rust toolchain
               uses: actions-rust-lang/setup-rust-toolchain@v1
               with:
-                  components: clippy, rustfmt
                   target: wasm32-unknown-unknown
 
             - name: Install Cargo Binary Install
@@ -49,7 +48,6 @@ jobs:
             - name: Set up Rust toolchain
               uses: actions-rust-lang/setup-rust-toolchain@v1
               with:
-                  components: clippy, rustfmt
                   target: wasm32-unknown-unknown
 
             - name: Install Cargo Binary Install
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,15 +1,40 @@
 repos:
+    - repo: https://github.com/pre-commit/mirrors-prettier
+      rev: v3.1.0
+      hooks:
+          - id: prettier
+            language: node
+            additional_dependencies:
+                - prettier@^3.6.2
+                - prettier-plugin-tailwindcss@^0.6.6
+
     - repo: https://github.com/doublify/pre-commit-rust
       rev: v1.0
       hooks:
           - id: fmt
           - id: clippy
 
-    - repo: https://github.com/pre-commit/mirrors-prettier
-      rev: v3.1.0
+    - repo: https://github.com/EmbarkStudios/cargo-deny
+      rev: 0.18.4
       hooks:
-          - id: prettier
-            language: node
-            additional_dependencies:
-                - prettier@^3.2.5
-                - prettier-plugin-tailwindcss@^0.6.0
+          - id: cargo-deny
+
+    # - repo: https://github.com/bnjbvr/cargo-machete
+    #   rev: ba1bcd4
+    #   hooks:
+    #       - id: cargo-machete
+    - repo: local
+      hooks:
+          - id: cargo-machete
+            name: cargo-machete
+            language: rust
+            entry: cargo machete
+            types: [file, toml]
+            files: Cargo\.(toml|lock)
+            pass_filenames: false
+
+    - repo: https://github.com/DevinR528/cargo-sort
+      rev: v2.0.1
+      hooks:
+          - id: cargo-sort
+            args: ['--workspace']
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -2,6 +2,5 @@
     "bracketSpacing": false,
     "printWidth": 120,
     "singleQuote": true,
-    "tabWidth": 4,
-    "trailingComma": "none"
+    "tabWidth": 4
 }
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/book-example/Cargo.toml b/book-example/Cargo.toml
@@ -9,12 +9,12 @@ license.workspace = true
 repository.workspace = true
 version.workspace = true
 
+[features]
+default = ["button"]
+button = []
+
 [dependencies]
 console_error_panic_hook = "0.1.7"
 console_log = "1.0.0"
 leptos = { version = "0.8.0", features = ["csr"] }
 log.workspace = true
-
-[features]
-default = ["button"]
-button = []
diff --git a/deny.toml b/deny.toml
@@ -0,0 +1,31 @@
+[graph]
+all-features = true
+
+[advisories]
+ignore = [
+    { id = "RUSTSEC-2024-0436", reason = "No maintained version available for `paste`." },
+]
+
+[bans]
+allow-wildcard-paths = true
+multiple-versions = "allow"
+wildcards = "deny"
+
+[licenses]
+allow = [
+    "Apache-2.0",
+    "BSD-2-Clause",
+    "BSD-3-Clause",
+    "BSL-1.0",
+    "CC0-1.0",
+    "ISC",
+    "MIT",
+    "MPL-2.0",
+    "Unicode-3.0",
+    "Zlib",
+]
+confidence-threshold = 1.0
+
+[sources]
+unknown-git = "deny"
+unknown-registry = "deny"
diff --git a/packages/mdbook-plugin-utils/Cargo.toml b/packages/mdbook-plugin-utils/Cargo.toml
@@ -12,6 +12,5 @@ version.workspace = true
 [dependencies]
 anyhow.workspace = true
 log.workspace = true
-mdbook.workspace = true
 pulldown-cmark.workspace = true
 test-log.workspace = true
diff --git a/packages/mdbook-tabs/Cargo.toml b/packages/mdbook-tabs/Cargo.toml
@@ -21,5 +21,3 @@ semver.workspace = true
 serde.workspace = true
 serde-keyvalue = "0.1.0"
 serde_json.workspace = true
-test-log.workspace = true
-toml = "0.9.0"
diff --git a/packages/mdbook-trunk/Cargo.toml b/packages/mdbook-trunk/Cargo.toml
@@ -25,5 +25,4 @@ pulldown-cmark.workspace = true
 semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-test-log.workspace = true
 toml = "0.9.0"

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,5 @@`
`2`	`2`	`"bracketSpacing": false,`
`3`	`3`	`"printWidth": 120,`
`4`	`4`	`"singleQuote": true,`
`5`		`- "tabWidth": 4,`
`6`		`- "trailingComma": "none"`
	`5`	`+ "tabWidth": 4`
`7`	`6`	`}`