Skip to content

Commit

Permalink
prettier + fmt + add dep to CI
Browse files Browse the repository at this point in the history
  • Loading branch information
wiiznokes committed Apr 18, 2024
1 parent 276c97b commit e7fc8ce
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 16 deletions.
32 changes: 19 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
- name: Run rustfmt
run: cargo fmt --all --check --verbose
2 changes: 0 additions & 2 deletions src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
1 change: 0 additions & 1 deletion src/db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ struct DataDb {

impl Db {
pub fn new() -> Result<Self, sled::Error> {

let directories = directories::ProjectDirs::from(QUALIFIER, ORG, APP).unwrap();
let db_path = directories.cache_dir().join(DB_FILE);

Expand Down

0 comments on commit e7fc8ce

Please sign in to comment.