diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9dd4729..b39eaf1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,9 +15,7 @@ jobs: AW_WEBUI_DIR: ${{ github.workspace }}/aw-webui/dist steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@master - with: - toolchain: nightly-2023-11-01 + - uses: dtolnay/rust-toolchain@stable - name: Install dependencies run: | sudo apt-get update diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 1e20ba3..33e4760 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@nightly + - uses: dtolnay/rust-toolchain@stable with: components: rustfmt - run: cargo fmt --check --all @@ -24,9 +24,8 @@ jobs: steps: - uses: actions/checkout@v4 - run: sudo apt-get install -y libdbus-1-dev - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@stable with: - toolchain: nightly-2023-11-01 components: clippy - uses: Swatinem/rust-cache@v2 - run: cargo clippy --locked --all-targets --all-features --workspace -- -D warnings @@ -37,9 +36,8 @@ jobs: steps: - uses: actions/checkout@v4 - run: sudo apt-get install -y libdbus-1-dev - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@stable with: - toolchain: stable components: clippy - uses: Swatinem/rust-cache@v2 - run: cargo clippy --locked --all-targets --workspace -- -D warnings @@ -50,9 +48,6 @@ jobs: steps: - uses: actions/checkout@v4 - run: sudo apt-get install -y libdbus-1-dev - - uses: dtolnay/rust-toolchain@master - with: - toolchain: nightly-2023-11-01 - components: clippy + - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 - run: cargo test --all-features --workspace diff --git a/src/config.rs b/src/config.rs index 80cdb14..736e667 100644 --- a/src/config.rs +++ b/src/config.rs @@ -11,7 +11,9 @@ use watchers::config::FileConfig; pub struct RunnerConfig { pub watchers_config: Config, + #[cfg(feature = "bundle")] pub config_file: PathBuf, + #[cfg(feature = "bundle")] pub no_tray: bool, } @@ -100,11 +102,10 @@ pub fn from_cli() -> anyhow::Result { filters: config.client.filters, no_server: *matches.get_one("no-server").unwrap(), }, + #[cfg(feature = "bundle")] config_file: config.config_file, #[cfg(feature = "bundle")] no_tray: *matches.get_one("no-tray").unwrap(), - #[cfg(not(feature = "bundle"))] - no_tray: true, }) }