diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1691bf0..b648e8b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,34 +29,40 @@ jobs: - run: rustup update - uses: Swatinem/rust-cache@v2 + - name: install system deps + run: sudo apt install libxkbcommon-dev + - name: Run tests run: cargo test --workspace --all-features - fmt: - name: Rustfmt + clippy: + name: Clippy on ${{ matrix.os }} if: github.event.pull_request.draft == false strategy: fail-fast: false - runs-on: ubuntu-latest + matrix: + os: [ubuntu-latest] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - run: rustup update + - uses: Swatinem/rust-cache@v2 - - name: Run rustfmt - run: cargo fmt --all --check --verbose + - name: install system deps + run: sudo apt install libxkbcommon-dev - clippy: - name: Clippy on ${{ matrix.os }} + - name: Run clippy + run: cargo clippy --workspace --all-features + + fmt: + name: Rustfmt if: github.event.pull_request.draft == false strategy: fail-fast: false - matrix: - os: [ ubuntu-latest ] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - run: rustup update - - uses: Swatinem/rust-cache@v2 - - name: Run clippy - run: cargo clippy --workspace --all-features \ No newline at end of file + - name: Run rustfmt + run: cargo fmt --all --check --verbose diff --git a/src/app.rs b/src/app.rs index 2cea5ea..4970988 100644 --- a/src/app.rs +++ b/src/app.rs @@ -26,8 +26,6 @@ use crate::{clipboard, config, navigation}; use cosmic::cosmic_config; use std::sync::atomic::{self, AtomicBool}; - - // todo: converge this 4 strings pub static QUALIFIER: &str = "com"; pub static ORG: &str = "wiiznokes"; diff --git a/src/db.rs b/src/db.rs index 5a28574..fb6b31e 100644 --- a/src/db.rs +++ b/src/db.rs @@ -80,7 +80,6 @@ struct DataDb { impl Db { pub fn new() -> Result { - let directories = directories::ProjectDirs::from(QUALIFIER, ORG, APP).unwrap(); let db_path = directories.cache_dir().join(DB_FILE);