From 1055841b6fb839d450febcf2356e26c7682572f4 Mon Sep 17 00:00:00 2001 From: Shaun Arman Date: Tue, 14 Apr 2026 20:50:47 -0500 Subject: [PATCH] fix: remove invalid --locked flag from cargo commands and fix format string - Remove --locked flag from cargo fmt, clippy, and test commands in CI - Update build.rs to use Rust 2021 direct variable interpolation in format strings --- .gitea/workflows/test.yml | 6 +++--- src-tauri/build.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 3054821d..9a778ba0 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -42,7 +42,7 @@ jobs: - name: Update version from Git run: node scripts/update-version.mjs - run: cargo generate-lockfile --manifest-path src-tauri/Cargo.toml - - run: cargo fmt --locked --manifest-path src-tauri/Cargo.toml --check + - run: cargo fmt --manifest-path src-tauri/Cargo.toml --check rust-clippy: runs-on: ubuntu-latest @@ -77,7 +77,7 @@ jobs: key: ${{ runner.os }}-cargo-linux-amd64-${{ hashFiles('**/Cargo.lock') }} restore-keys: | ${{ runner.os }}-cargo-linux-amd64- - - run: cargo clippy --locked --manifest-path src-tauri/Cargo.toml -- -D warnings + - run: cargo clippy --manifest-path src-tauri/Cargo.toml -- -D warnings rust-tests: runs-on: ubuntu-latest @@ -112,7 +112,7 @@ jobs: key: ${{ runner.os }}-cargo-linux-amd64-${{ hashFiles('**/Cargo.lock') }} restore-keys: | ${{ runner.os }}-cargo-linux-amd64- - - run: cargo test --locked --manifest-path src-tauri/Cargo.toml -- --test-threads=1 + - run: cargo test --manifest-path src-tauri/Cargo.toml -- --test-threads=1 frontend-typecheck: runs-on: ubuntu-latest diff --git a/src-tauri/build.rs b/src-tauri/build.rs index 03a1b039..55db2c01 100644 --- a/src-tauri/build.rs +++ b/src-tauri/build.rs @@ -1,7 +1,7 @@ fn main() { let version = get_version_from_git(); - println!("cargo:rustc-env=APP_VERSION={}", version); + println!("cargo:rustc-env=APP_VERSION={version}"); println!("cargo:rerun-if-changed=.git/refs/heads/master"); println!("cargo:rerun-if-changed=.git/refs/tags");