diff --git a/.github/workflows/linutil.yml b/.github/workflows/linutil.yml index 34ce5d4c..30f7f8ad 100644 --- a/.github/workflows/linutil.yml +++ b/.github/workflows/linutil.yml @@ -30,13 +30,11 @@ jobs: key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.os }}-cargo-index- - name: Install Rust - uses: actions-rs/toolchain@v1 - with: - toolchain: stable + uses: dtolnay/rust-toolchain@stable - name: Build run: cargo build --target-dir=build --release --verbose - uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: Commit Linutil file_pattern: 'build/release/linutil' - if: success() \ No newline at end of file + if: success() diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 471af03f..0b2e12a4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,4 +1,4 @@ -name: Rust Check +name: Rust Checks on: pull_request: @@ -9,25 +9,46 @@ env: jobs: cargo_check: + name: Cargo Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - name: Checkout sources + uses: actions/checkout@v4 + - name: Cache Cargo registry uses: actions/cache@v4 with: path: ~/.cargo/registry key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.os }}-cargo-registry- + - name: Cache Cargo index uses: actions/cache@v4 with: path: ~/.cargo/git key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.os }}-cargo-index- + - name: Install Rust - uses: actions-rs/toolchain@v1 - with: - toolchain: stable + uses: dtolnay/rust-toolchain@stable + - name: Build - run: cargo check \ No newline at end of file + run: cargo check + + lints: + name: Lints + runs-on: ubuntu-latest + + steps: + - name: Checkout sources + uses: actions/checkout@v4 + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + + - name: Run cargo fmt + run: cargo fmt --all --check + + - name: Run cargo clippy + run: cargo clippy