From fd00ef0b4f1a9db6513536ef0b898e622147971a Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@luon.net>
Date: Tue, 25 Apr 2023 16:23:32 +0200
Subject: [PATCH] Simplify Gitea Actions check and lint workflow

---
 .gitea/workflows/cargo.yml      | 83 ---------------------------------
 .gitea/workflows/check-lint.yml | 48 +++++++++++++++++++
 2 files changed, 48 insertions(+), 83 deletions(-)
 delete mode 100644 .gitea/workflows/cargo.yml
 create mode 100644 .gitea/workflows/check-lint.yml

diff --git a/.gitea/workflows/cargo.yml b/.gitea/workflows/cargo.yml
deleted file mode 100644
index b0633bf..0000000
--- a/.gitea/workflows/cargo.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-name: "Check, Test and Lint Using Cargo"
-
-on:
-  - push
-  - pull_request
-  - workflow_dispatch
-
-jobs:
-  check:
-    name: Check
-    runs-on: debian-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Install stable toolchain
-        uses: https://github.com/actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-
-      - name: Use sparse Cargo index for crates.io
-        run: echo -e '[registries.crates-io]\nprotocol = "sparse"' >> /root/.cargo/config.toml
-
-      - name: Run cargo check
-        uses: https://github.com/actions-rs/cargo@v1
-        with:
-          command: check
-
-  # TODO: Add a test suite first!
-  # test:
-  #   name: Test Suite
-  #   runs-on: debian-latest
-  #   steps:
-  #     - name: Checkout sources
-  #       uses: actions/checkout@v3
-  #
-  #     - name: Install stable toolchain
-  #       uses: https://github.com/actions-rs/toolchain@v1
-  #       with:
-  #         profile: minimal
-  #         toolchain: stable
-  #         override: true
-  #
-  #     - name: Use sparse Cargo index for crates.io
-  #       run: echo -e '[registries.crates-io]\nprotocol = "sparse"' >> /root/.cargo/config.toml
-  #
-  #     - name: Run cargo test
-  #       uses: https://github.com/actions-rs/cargo@v1
-  #       with:
-  #         command: test
-  #         args: --all-features
-
-  lints:
-    name: Lints
-    runs-on: debian-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Install stable toolchain
-        uses: https://github.com/actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          components: rustfmt, clippy
-
-      - name: Use sparse Cargo index for crates.io
-        run: echo -e '[registries.crates-io]\nprotocol = "sparse"' >> /root/.cargo/config.toml
-
-      - name: Run cargo fmt
-        uses: https://github.com/actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-      - name: Run cargo clippy
-        uses: https://github.com/actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: -- -D warnings
diff --git a/.gitea/workflows/check-lint.yml b/.gitea/workflows/check-lint.yml
new file mode 100644
index 0000000..3118a83
--- /dev/null
+++ b/.gitea/workflows/check-lint.yml
@@ -0,0 +1,48 @@
+name: "Check, test and lint using Cargo"
+
+on:
+  - pull_request
+  - push
+  - workflow_dispatch
+
+jobs:
+  check_lint:
+    name: Check and lint
+    runs-on: debian-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v3
+
+      - name: Install stable toolchain
+        uses: https://github.com/actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+
+      - name: Use sparse Cargo index for crates.io
+        run: echo -e '[registries.crates-io]\nprotocol = "sparse"' >> /root/.cargo/config.toml
+
+      - name: Run cargo check
+        uses: https://github.com/actions-rs/cargo@v1
+        with:
+          command: check
+
+      - name: Run cargo fmt
+        uses: https://github.com/actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+      - name: Run cargo clippy
+        uses: https://github.com/actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: -- -D warnings
+
+      # TODO: Add a test suite first!
+      # - name: Run cargo test
+      #   uses: https://github.com/actions-rs/cargo@v1
+      #   with:
+      #     command: test
+      #     args: --all-features