Merge #325

325: Call cargo directly instead of using actions-rs/cargo r=jdroenner a=lnicola - [x] I agree to follow the project's [code of conduct](https://github.com/georust/gdal/blob/master/CODE_OF_CONDUCT.md). - [ ] I added an entry to `CHANGES.md` if knowledge of this change could be valuable to users. --- `actions-rs` is unmaintained, and doesn't bring us that much. I think we might lose the nice GitHub integration, but it wasn't really working anyway. Co-authored-by: Laurențiu Nicola <[email protected]>
georust · Oct 31, 2022 · 2ba03c1 · 2ba03c1
2 parents fe72e81 + 093a525
commit 2ba03c1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 82 deletions.
diff --git 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
@@ -1,5 +1,4 @@
 status = [
     "ci ubuntu-lts",
-    "ci ubuntu-lts (--all-features)",
-    "clippy"
+    "ci ubuntu-lts (--all-features)"
 ]