From 7a2c3dd82b197e47dd2ea5570d178d4172485aa9 Mon Sep 17 00:00:00 2001
From: "Christoph J. Scherr" <software@cscherr.de>
Date: Fri, 14 Mar 2025 22:28:23 +0100
Subject: [PATCH] update ci

---
 .gitea/workflows/cargo.yaml  | 50 ---------------------------
 .github/workflows/cargo.yaml | 66 ++++++++++++++++++------------------
 2 files changed, 33 insertions(+), 83 deletions(-)
 delete mode 100644 .gitea/workflows/cargo.yaml

diff --git a/.gitea/workflows/cargo.yaml b/.gitea/workflows/cargo.yaml
deleted file mode 100644
index fd4c40c..0000000
--- a/.gitea/workflows/cargo.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: cargo devel CI
-on:
-  push:
-    branches:
-      - '**'
-      # - '!master'
-
-jobs:
-  format:
-    name: cargo CI
-    permissions:
-      # Give the default GITHUB_TOKEN write permission to commit and push the
-      # added or changed files to the repository.
-      contents: write
-    steps:
-      - name: get repo
-        uses: actions/checkout@v4
-      - name: install rust
-        uses: https://github.com/dtolnay/rust-toolchain@stable
-      - name: install additional rust things
-        run: |
-          rustup component add rustfmt
-          rustup component add clippy
-      - name: install additional dependencies
-        run: |
-          apt update -y
-          apt install libgtk-3-dev librust-atk-dev -y
-      - name: config custom registry
-        run: |
-          mkdir -p ~/.cargo/
-          echo "" > ~/.cargo/config.toml
-          echo "[registry]" >> ~/.cargo/config.toml
-          echo 'cscherr = "cscherr"' >> ~/.cargo/config.toml
-          echo '[registries.cscherr]' >> ~/.cargo/config.toml
-          echo 'index = "https://git.cscherr.de/PlexSheep/_cargo-index.git"' >> ~/.cargo/config.toml
-          cat ~/.cargo/config.toml
-      - name: cargo clippy check
-        run: cargo clippy --all-features --all-targets --workspace
-      - name: cargo clippy fix
-        run: cargo clippy --fix --all-features --all-targets --workspace
-      - name: cargo fmt
-        run: cargo fmt --all
-      - name: cargo test
-        run: cargo test --all-features --all-targets --workspace && cargo test --all-features --workspace --doc
-      - name: commit back to repository
-        uses: https://github.com/stefanzweifel/git-auto-commit-action@v5
-        with:
-          # Optional. Commit message for the created commit.
-          # Defaults to "Apply automatic changes"
-          commit_message: automatic cargo CI changes
diff --git a/.github/workflows/cargo.yaml b/.github/workflows/cargo.yaml
index ecb2c2c..bb333fd 100644
--- a/.github/workflows/cargo.yaml
+++ b/.github/workflows/cargo.yaml
@@ -1,51 +1,51 @@
-name: cargo devel CI
+name: Rust CI
 on:
   push:
     branches:
       - '**'
-      # - '!master'
+
+env:
+  CARGO_TERM_COLOR: always
 
 jobs:
-  CI:
+  test:
+    name: Test Suite
     runs-on: ubuntu-latest
-    name: cargo CI
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+      - name: Run tests
+        run: ./cargo.sh test --all-features --workspace --all-targets
+
+  clippy:
     permissions:
       # Give the default GITHUB_TOKEN write permission to commit and push the
       # added or changed files to the repository.
       contents: write
+    name: Clippy
+    runs-on: ubuntu-latest
     steps:
-      - name: get repo
+      - name: Checkout repository
         uses: actions/checkout@v4
-      - name: install rust
+      - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
-      - name: install additional rust things
-        run: |
-          rustup component add rustfmt
-          rustup component add clippy
-      - name: install additional dependencies
-        run: |
-          apt update -y
-          apt install libgtk-3-dev librust-atk-dev -y
-      - name: config custom registry
-        run: |
-          mkdir -p ~/.cargo/
-          echo "" > ~/.cargo/config.toml
-          echo "[registry]" >> ~/.cargo/config.toml
-          echo 'cscherr = "cscherr"' >> ~/.cargo/config.toml
-          echo '[registries.cscherr]' >> ~/.cargo/config.toml
-          echo 'index = "https://git.cscherr.de/PlexSheep/_cargo-index.git"' >> ~/.cargo/config.toml
-          cat ~/.cargo/config.toml
-      - name: cargo clippy check
-        run: cargo clippy --all-features --all-targets --workspace
-      - name: cargo clippy fix
-        run: cargo clippy --fix --all-features --all-targets --workspace
-      - name: cargo fmt
+        with:
+          components: clippy,rustfmt
+      - uses: Swatinem/rust-cache@v2
+      - name: Clippy check and fix
+        run: cargo clippy --fix --all-targets --all-features --workspace
+      - name: Check formatting
         run: cargo fmt --all
-      - name: cargo test
-        run: cargo test --all-features --all-targets --workspace && cargo test --all-features --workspace --doc
       - name: commit back to repository
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          # Optional. Commit message for the created commit.
-          # Defaults to "Apply automatic changes"
-          commit_message: automatic cargo CI changes
+          # These defaults somehow do not work for me, so I've set them 
+          # explicitly
+          # The big number is the userid of the bot
+          commit_user_name: github-actions[bot]
+          commit_user_email: 41898282+github-actions[bot]@users.noreply.github.com
+          commit_author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> # defaults to "username <username@users.noreply.github.com>", where "username" belongs to the author of the commit that triggered the run
+          commit_message: "ci: automatic Rust CI changes"