GitHub CI: Update workflows

uklotzde · Jul 29, 2023 · 6c08ab8 · 6c08ab8
1 parent 6272644
commit 6c08ab8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -21,16 +21,16 @@ env:
   RUST_BACKTRACE: short
 
 jobs:
-  build-and-test:
+  run:
     runs-on: ubuntu-latest
 
     steps:
       - name: Install ALSA and Jack dependencies
-        run: |
-          sudo apt-get update && \
-          sudo apt-get install -y \
-          libasound2-dev \
-          libjack-jackd2-dev \
+        run: >-
+          sudo apt-get update &&
+          sudo apt-get install -y
+          libasound2-dev
+          libjack-jackd2-dev
           libudev-dev
 
       - name: Install Rust toolchain
@@ -44,9 +44,16 @@ jobs:
 
       - name: Cache Rust toolchain and build artifacts
         uses: Swatinem/rust-cache@v2
+        with:
+          # The cache should not be shared between different workflows and jobs.
+          shared-key: ${{ github.workflow }}-${{ github.job }}
 
       - name: Build tests
-        run: cargo test --locked --all-targets --all-features --no-run
+        run: >-
+          cargo test --locked --all-targets --all-features
+          --no-run
 
       - name: Run tests
-        run: cargo test --locked --all-targets --all-features -- --nocapture --quiet
+        run: >-
+          cargo test --locked --all-targets --all-features
+          -- --nocapture --quiet
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
@@ -19,16 +19,16 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  pre-commit:
+  run:
     runs-on: ubuntu-latest
 
     steps:
       - name: Install ALSA and Jack dependencies
-        run: |
-          sudo apt-get update && \
-          sudo apt-get install -y \
-          libasound2-dev \
-          libjack-jackd2-dev \
+        run: >-
+          sudo apt-get update &&
+          sudo apt-get install -y
+          libasound2-dev
+          libjack-jackd2-dev
           libudev-dev
 
       - name: Setup Python
@@ -49,6 +49,9 @@ jobs:
 
       - name: Cache Rust toolchain and build artifacts
         uses: Swatinem/rust-cache@v2
+        with:
+          # The cache should not be shared between different workflows and jobs.
+          shared-key: ${{ github.workflow }}-${{ github.job }}
 
       - name: Detect code style issues (push)
         uses: pre-commit/[email protected]

diff --git a/.github/workflows/security-audit.yaml b/.github/workflows/security-audit.yaml
@@ -15,7 +15,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  security-audit:
+  run:
     runs-on: ubuntu-latest
 
     steps:
@@ -31,6 +31,9 @@ jobs:
 
       - name: Cache Rust toolchain and build artifacts
         uses: Swatinem/rust-cache@v2
+        with:
+          # The cache should not be shared between different workflows and jobs.
+          shared-key: ${{ github.workflow }}-${{ github.job }}
 
       - name: Run security audit
         run: cargo audit --deny unsound --deny yanked