ci(rust): improve workflow

HAWHHCalendarBot · Jan 22, 2025 · 760b8b2 · 760b8b2
1 parent c17513c
commit 760b8b2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 27 deletions.
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
   # Build regularly in order to have up to date base image in the edge image
   schedule:
-    - cron: '42 2 * * 6' # weekly on Saturday 2:42 UTC
+    - cron: "42 2 * * 6" # weekly on Saturday 2:42 UTC
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -8,17 +8,11 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     steps:
-      - name: Setup Rust
+      - uses: dtolnay/rust-toolchain@stable
         id: rust
-        uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
           components: llvm-tools-preview
-
-      - name: Install cargo-llvm-cov
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-llvm-cov
+      - uses: taiki-e/install-action@cargo-llvm-cov
 
       - uses: actions/checkout@v4
       - run: cargo fetch
@@ -27,11 +21,9 @@ jobs:
           key: coverage-${{ steps.rust.outputs.cachekey }}-${{ hashFiles('**/Cargo.*') }}
           path: target/
 
-      - name: Run cargo-llvm-cov
-        run: cargo llvm-cov --all-features --html
+      - run: cargo llvm-cov --html
 
-      - name: Upload Report
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
         with:
           name: coverage-report
           path: target/llvm-cov/html
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -1,4 +1,4 @@
-name: Test and Build Rust
+name: Rust
 
 on:
   push:
@@ -16,7 +16,6 @@ jobs:
       - run: cargo fmt --check --verbose
 
   clippy:
-    name: Clippy ${{ matrix.toolchain }}
     runs-on: ubuntu-latest
     continue-on-error: ${{ (matrix.toolchain == 'beta') || (matrix.toolchain == 'nightly') }}
     strategy:
@@ -29,9 +28,8 @@ jobs:
     env:
       RUSTFLAGS: --deny warnings
     steps:
-      - name: Setup Rust
+      - uses: dtolnay/rust-toolchain@master
         id: rust
-        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.toolchain }}
           components: clippy
@@ -45,7 +43,6 @@ jobs:
       - run: cargo doc --offline --no-deps
 
   test:
-    name: Test ${{ matrix.toolchain }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.toolchain == 'nightly' }}
     strategy:
@@ -59,9 +56,8 @@ jobs:
           - ubuntu-latest
           - macos-latest
     steps:
-      - name: Setup Rust
+      - uses: dtolnay/rust-toolchain@master
         id: rust
-        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.toolchain }}
       - uses: actions/checkout@v4
@@ -89,11 +85,9 @@ jobs:
     env:
       RUSTFLAGS: --deny warnings
     steps:
-      - name: Setup Rust
+      - uses: dtolnay/rust-toolchain@stable
         id: rust
-        uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
           targets: ${{ matrix.triple }}
 
       - name: Install cargo tools
@@ -123,8 +117,7 @@ jobs:
           key: release-${{ matrix.triple }}-${{ steps.rust.outputs.cachekey }}-${{ hashFiles('**/Cargo.*') }}
           path: target/
 
-      - name: Build
-        run: ${{ runner.os == 'Linux' && 'cross' || 'cargo' }} build --release --offline --target ${{ matrix.triple }}
+      - run: ${{ runner.os == 'Linux' && 'cross' || 'cargo' }} build --release --offline --target ${{ matrix.triple }}
 
       - name: Package tar.gz (*nix)
         if: runner.os != 'Windows'
@@ -134,8 +127,7 @@ jobs:
           -C target/${{ matrix.triple }}/release/ mensa-crawler
           | gzip --best > ${{ env.ARTIFACT_NAME }}.tar.gz
 
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.triple }}
           path: |