diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c432f745..c308fbf6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,13 +14,9 @@ jobs: - name: Checkout sources uses: actions/checkout@v3 - name: Rust toolchain - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: - toolchain: stable - override: true - profile: minimal components: rustfmt - default: true - name: Cargo cache uses: actions/cache@v3 with: @@ -29,10 +25,7 @@ jobs: ~/.cargo/git key: ${{ runner.os }}-cargo-rust_stable-${{ hashFiles('**/Cargo.toml') }} - name: Format - uses: actions-rs/cargo@v1 - with: - command: fmt - args: -- --check + run: cargo fmt -- --check tests: needs: @@ -69,18 +62,11 @@ jobs: - name: System dependencies run: sudo apt-get update; sudo apt-get install -y libxkbcommon-dev libwayland-dev - name: Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - default: true + uses: dtolnay/rust-toolchain@stable - name: Test features - uses: actions-rs/cargo@v1 + run: cargo test --no-default-features --features "${{ matrix.features }}" env: RUST_BACKTRACE: full - with: - command: test - args: --no-default-features --features "${{ matrix.features }}" examples: needs: @@ -112,16 +98,8 @@ jobs: - name: System dependencies run: sudo apt-get update; sudo apt-get install -y libxkbcommon-dev libwayland-dev - name: Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - default: true + uses: dtolnay/rust-toolchain@stable - name: Test example - uses: actions-rs/cargo@v1 + run: cargo check -p "${{ matrix.examples }}" env: RUST_BACKTRACE: full - with: - command: check - args: -p "${{ matrix.examples }}" - diff --git a/justfile b/justfile index b93bae64..18e06b51 100644 --- a/justfile +++ b/justfile @@ -1,4 +1,5 @@ -examples := 'application cosmic cosmic-design-demo open-dialog' +examples := 'applet application config cosmic cosmic-design-demo multi-window open-dialog' +clippy_args := '-W clippy::all -W clippy::pedantic' # Check for errors and linter warnings check *args: (check-wayland args) (check-winit args) (check-examples args) @@ -6,14 +7,14 @@ check *args: (check-wayland args) (check-winit args) (check-examples args) check-examples *args: #!/bin/bash for project in {{examples}}; do - cargo check -p ${project} {{args}} + cargo clippy -p ${project} {{args}} -- {{clippy_args}} done check-wayland *args: - cargo clippy --no-deps --features="wayland,tokio" {{args}} -- -W clippy::pedantic + cargo clippy --no-deps --features="wayland,tokio" {{args}} -- {{clippy_args}} check-winit *args: - cargo clippy --no-deps --features="winit,tokio" {{args}} -- -W clippy::pedantic + cargo clippy --no-deps --features="winit,tokio" {{args}} -- {{clippy_args}} # Runs a check with JSON message format for IDE integration check-json: (check '--message-format=json')