fix: remove NIL_DIR env var (#316)

* fix: remove `NIL_DIR` env var

* chore: bump version

* ci: trusted publishing

Author: ferreira-tb

.cargo/config.toml

@@ -4,6 +4,3 @@ rustflags = []
 
 [env]
 CARGO_TARGET_DIR = "target"
-
-# Relative to the home dir.
-NIL_DIR = ".tsukilabs/nil"

.github/CONTRIBUTING.md

@@ -51,7 +51,6 @@ Here’s a simplified list of the steps you’ll need to take. In some cases, yo
 ## Environment variables
 
 - [`NIL_DATABASE_URL`](/crates/nil-server/src/main.rs)
-- [`NIL_DIR`](/app/src-tauri/src/manager.rs)
 - [`NIL_JWT_SECRET`](/crates/nil-server/src/middleware/authorization.rs)
 - [`NIL_LOG_DIR`](/crates/nil-log/src/lib.rs)
 - [`NIL_LOG_TOWER_HTTP`](/crates/nil-log/src/lib.rs)

.github/workflows/release.yml

@@ -1,12 +1,29 @@
 name: Release
 
 on:
-  workflow_dispatch:
   push:
     branches: [release]
 
 jobs:
+  publish:
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@nightly
+
+      - uses: rust-lang/crates-io-auth-action@v1
+        id: auth
+      - run: cargo publish --workspace
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}
+
   release-client:
+    needs: publish
     permissions:
       contents: write
     strategy:
@@ -72,8 +89,7 @@ jobs:
         uses: dtolnay/rust-toolchain@nightly
 
       - name: Install dependencies (Ubuntu)
-        run: |
-          sudo apt-get update
+        run: sudo apt-get update
 
       - name: Release
         run: cargo +nightly -Zscript scripts/build-server.rs --release

Cargo.lock

@@ -21,7 +21,7 @@ members = [
 
 [workspace.package]
 description = "Multiplayer strategy game"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2024"
 rust-version = "1.95"
 license = "AGPL-3.0-only"

Cargo.toml

@@ -30,7 +30,7 @@ pub trait ManagerExt: Manager<Wry> {
 
   fn nil_dir(&self) -> Result<PathBuf> {
     let mut dir = if let Some(home) = env::home_dir() {
-      home.join(env!("NIL_DIR"))
+      home.join(".tsukilabs/nil")
     } else {
       self.path().app_cache_dir()?
     };

app/src-tauri/src/manager.rs

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2.0.0",
   "productName": "Call of Nil",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "identifier": "tsukilabs.nil",
   "build": {
     "beforeDevCommand": "pnpm run -F ui dev",

app/src-tauri/tauri.conf.json

@@ -14,7 +14,7 @@ authors.workspace = true
 
 [package.metadata.docs.rs]
 no-default-features = true
-features = ["lua"]
+features = []
 default-target = "x86_64-unknown-linux-gnu"
 targets = []
 
@@ -47,10 +47,8 @@ tokio-tungstenite.workspace = true
 url.workspace = true
 
 [dependencies.mlua]
-version = "0.11"
+workspace = true
 optional = true
-default-features = false
-features = ["lua55"]
 
 [features]
 lua = ["dep:mlua", "nil-core/lua"]

crates/nil-client/Cargo.toml

@@ -14,7 +14,7 @@ authors.workspace = true
 
 [package.metadata.docs.rs]
 no-default-features = true
-features = ["lua"]
+features = []
 default-target = "x86_64-unknown-linux-gnu"
 targets = []
 
@@ -51,10 +51,8 @@ tracing.workspace = true
 uuid.workspace = true
 
 [dependencies.mlua]
-version = "0.11"
+workspace = true
 optional = true
-default-features = false
-features = ["lua55"]
 
 [features]
 lua = ["dep:mlua"]

crates/nil-core/Cargo.toml

@@ -10,7 +10,7 @@ use std::borrow::Cow;
 use std::fmt;
 use std::ops::Deref;
 use std::sync::Arc;
-use tap::Pipe;
+use tap::{Pipe, TapFallible};
 
 #[derive(Clone, Default, From, Into, PartialEq, Eq, Hash, Deserialize, Serialize)]
 #[from(String, &str, Arc<str>, Box<str>, Cow<'_, str>)]
@@ -32,14 +32,9 @@ impl Password {
   }
 
   pub fn verify(&self, hash: &str) -> bool {
-    let result = verify(self.0.as_bytes(), hash);
-
-    #[cfg(debug_assertions)]
-    if let Err(err) = &result {
-      tracing::debug!(error = %err);
-    }
-
-    result.is_ok()
+    verify(self.0.as_bytes(), hash)
+      .tap_err_dbg(|err| tracing::debug!(error = %err))
+      .is_ok()
   }
 }