Fix clippy errors + lint, use turbo CI

modrinth · Oct 18, 2024 · 8dd9555 · 8dd9555
1 parent 663ab83
commit 8dd9555
Show file tree

Hide file tree

Showing 186 changed files with 10,729 additions and 6,547 deletions.
diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml
diff --git a/.github/workflows/turbo-ci.yml b/.github/workflows/turbo-ci.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    name: Build, Test, and Lint (Turbo)
+    name: Build, Test, and Lint
     runs-on: ubuntu-22.04
 
     steps:
@@ -66,5 +66,8 @@ jobs:
       - name: Lint
         run: pnpm lint
 
+      - name: Start docker compose
+        run: docker-compose up -d
+
       - name: Test
         run: pnpm test
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/app-playground/package.json b/apps/app-playground/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@modrinth/app-playground",
+  "scripts": {
+    "build": "cargo build --release",
+    "lint": "cargo fmt --check && cargo clippy --all-targets --all-features -- -D warnings",
+    "fix": "cargo fmt && cargo clippy --fix",
+    "dev": "cargo run",
+    "test": "cargo test"
+  }
+}
diff --git a/apps/app/package.json b/apps/app/package.json
@@ -3,7 +3,10 @@
   "scripts": {
     "build": "tauri build",
     "tauri": "tauri",
-    "dev": "tauri dev"
+    "dev": "tauri dev",
+    "test": "cargo test",
+    "lint": "cargo fmt --check && cargo clippy --all-targets --all-features -- -D warnings",
+    "fix": "cargo fmt && cargo clippy --fix"
   },
   "devDependencies": {
     "@tauri-apps/cli": "2.0.0-rc.16"
@@ -12,4 +15,4 @@
     "@modrinth/app-frontend": "workspace:*",
     "@modrinth/app-lib": "workspace:*"
   }
-}
+}
diff --git a/apps/labrinth/Cargo.toml b/apps/labrinth/Cargo.toml
@@ -88,8 +88,8 @@ rust_decimal = { version = "1.33.1", features = [
     "serde-with-float",
     "serde-with-str",
 ] }
-redis = { version = "0.24.0", features = ["tokio-comp", "ahash", "r2d2"]}
-deadpool-redis = "0.14.0"
+redis = { version = "0.27.5", features = ["tokio-comp", "ahash", "r2d2"]}
+deadpool-redis = "0.18.0"
 clickhouse = { version = "0.11.2", features = ["uuid", "time"] }
 uuid = { version = "1.2.2", features = ["v4", "fast-rng", "serde"] }
 

diff --git a/apps/labrinth/package.json b/apps/labrinth/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@modrinth/labrinth",
+  "scripts": {
+    "build": "cargo build --release",
+    "lint": "cargo fmt --check && cargo clippy --all-targets --all-features -- -D warnings",
+    "fix": "cargo fmt && cargo clippy --fix",
+    "dev": "cargo run",
+    "test": "cargo test"
+  }
+}