diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91a163a0..8147236b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,25 +41,14 @@ jobs: override: true components: rustfmt, clippy - name: Check with Rustfmt - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + run: cargo fmt --all --check - name: Check with Clippy - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --all-targets ${{ matrix.features }} -- -D warnings + run: cargo clippy --all-targets ${{ matrix.features }} -- -D warnings - name: Build - uses: actions-rs/cargo@v1 - with: - command: build - args: ${{ matrix.features }} --verbose + run: cargo build ${{ matrix.features }} --verbose - name: Run tests - uses: actions-rs/cargo@v1 - with: - command: test - args: ${{ matrix.features }} --verbose + run: cargo test ${{ matrix.features }} --verbose + gdal_34: name: "ci gdal-34" runs-on: ubuntu-latest @@ -89,25 +78,13 @@ jobs: override: true components: rustfmt, clippy - name: Check with Rustfmt - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + run: cargo fmt --all --check - name: Check with Clippy - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --all-targets ${{ matrix.features }} -- -D warnings + run: cargo clippy --all-targets ${{ matrix.features }} -- -D warnings - name: Build - uses: actions-rs/cargo@v1 - with: - command: build - args: ${{ matrix.features }} --verbose + run: cargo build ${{ matrix.features }} --verbose - name: Run tests - uses: actions-rs/cargo@v1 - with: - command: test - args: ${{ matrix.features }} --verbose + run: cargo test ${{ matrix.features }} --verbose gdal_33: name: "ci gdal-33" @@ -138,25 +115,13 @@ jobs: override: true components: rustfmt, clippy - name: Check with Rustfmt - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + run: cargo fmt --all --check - name: Check with Clippy - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --all-targets ${{ matrix.features }} -- -D warnings + run: cargo clippy --all-targets ${{ matrix.features }} -- -D warnings - name: Build - uses: actions-rs/cargo@v1 - with: - command: build - args: ${{ matrix.features }} --verbose + run: cargo build ${{ matrix.features }} --verbose - name: Run tests - uses: actions-rs/cargo@v1 - with: - command: test - args: ${{ matrix.features }} --verbose + run: cargo test ${{ matrix.features }} --verbose gdal_32: name: "ci gdal-32" @@ -187,25 +152,13 @@ jobs: override: true components: rustfmt, clippy - name: Check with Rustfmt - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + run: cargo fmt --all --check - name: Check with Clippy - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --all-targets ${{ matrix.features }} -- -D warnings + run: cargo clippy --all-targets ${{ matrix.features }} -- -D warnings - name: Build - uses: actions-rs/cargo@v1 - with: - command: build - args: ${{ matrix.features }} --verbose + run: cargo build ${{ matrix.features }} --verbose - name: Run tests - uses: actions-rs/cargo@v1 - with: - command: test - args: ${{ matrix.features }} --verbose + run: cargo test ${{ matrix.features }} --verbose ubuntu_lts: name: "ci ubuntu-lts" @@ -230,22 +183,10 @@ jobs: export CC="clang-9" export CXX="clang++-9" - name: Check with Rustfmt - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + run: cargo fmt --all --check - name: Check with Clippy - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --all-targets ${{ matrix.features }} -- -D warnings + run: cargo clippy --all-targets ${{ matrix.features }} -- -D warnings - name: Build - uses: actions-rs/cargo@v1 - with: - command: build - args: ${{ matrix.features }} --verbose + run: cargo build ${{ matrix.features }} --verbose - name: Run tests - uses: actions-rs/cargo@v1 - with: - command: test - args: ${{ matrix.features }} --verbose + run: cargo test ${{ matrix.features }} --verbose diff --git a/bors.toml b/bors.toml index f9a47e11..d80d57d7 100644 --- a/bors.toml +++ b/bors.toml @@ -1,5 +1,4 @@ status = [ "ci ubuntu-lts", - "ci ubuntu-lts (--all-features)", - "clippy" + "ci ubuntu-lts (--all-features)" ]