Merge pull request #10616 from Byron/fix

Enable more fine-grained caching for Rust enabled CI pipelines

Author: Byron

.github/workflows/push.yaml

@@ -94,16 +94,25 @@ jobs:
     needs: changes
     if: ${{ needs.changes.outputs.rust == 'true' }}
     runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/gitbutlerapp/ci-base-image:latest
     env:
       CARGO_TERM_COLOR: always
     steps:
+      - name: Rust Cache
+        uses: Swatinem/[email protected]
+        with:
+          shared-key: rust-lint
+          save-if: ${{ github.ref == 'refs/heads/master' }}
       - uses: actions/checkout@v5
         with:
           persist-credentials: false
+      - run: sudo scripts/install-debian-dependencies.sh
+        name: Install Dependencies
       - run: cargo fmt --check --all
       - run: cargo check --workspace --all-targets
+      - name: cargo clippy
+        run: |
+          rustup component add clippy
+          cargo clippy --workspace --all-targets -- -D warnings
 
   rust-but-binary-no-tauri:
     needs: changes
@@ -112,6 +121,11 @@ jobs:
     env:
       CARGO_TERM_COLOR: always
     steps:
+      - name: Rust Cache
+        uses: Swatinem/[email protected]
+        with:
+          shared-key: rust-but-binary
+          save-if: ${{ github.ref == 'refs/heads/master' }}
       - uses: actions/checkout@v5
         with:
           persist-credentials: false
@@ -124,16 +138,19 @@ jobs:
     needs: changes
     if: ${{ needs.changes.outputs.rust == 'true' }}
     runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/gitbutlerapp/ci-base-image:latest
     env:
       CARGO_TERM_COLOR: always
     steps:
       - uses: actions/checkout@v5
         with:
           persist-credentials: false
-      # TODO(qix-): we have to exclude the app here for now because for some
-      # TODO(qix-): reason it doesn't build with the docs feature enabled.
+      - name: Rust Cache
+        uses: Swatinem/[email protected]
+        with:
+          shared-key: rust-docs
+          save-if: ${{ github.ref == 'refs/heads/master' }}
+      - run: sudo scripts/install-debian-dependencies.sh
+        name: Install Dependencies
       - run: cargo doc --no-deps --all-features --document-private-items -p gitbutler-git
         env:
           RUSTDOCFLAGS: -Dwarnings
@@ -166,29 +183,15 @@ jobs:
       - name: Rust Cache
         uses: Swatinem/[email protected]
         with:
-          shared-key: unix-rust-testing-v2
-      - run: |
-          sudo apt update
-          sudo apt install libwebkit2gtk-4.1-dev \
-            build-essential \
-            curl \
-            wget \
-            file \
-            libxdo-dev \
-            libssl-dev \
-            libayatana-appindicator3-dev \
-            librsvg2-dev \
-            cmake
+          shared-key: rust-testing
+          save-if: ${{ github.ref == 'refs/heads/master' }}
+      - run: sudo scripts/install-debian-dependencies.sh
         name: Install Dependencies
       - run: |
           cargo test --workspace
         env:
           GITBUTLER_TESTS_NO_CLEANUP: '1'
         name: cargo test
-      - run: |
-          rustup component add clippy
-          cargo clippy --workspace --all-targets -- -D warnings
-        name: cargo clippy
       - run: |
           set -e
           cargo check -p gitbutler-tauri --no-default-features
@@ -197,6 +200,24 @@ jobs:
           done
         name: Check Tauri App
 
+  check-rust-windows:
+    needs: changes
+    runs-on: windows-latest
+    if: ${{ needs.changes.outputs.rust == 'true' }}
+    env:
+      CARGO_TERM_COLOR: always
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
+      - name: Rust Cache
+        uses: Swatinem/[email protected]
+        with:
+          shared-key: rust-testing
+          save-if: ${{ github.ref == 'refs/heads/master' }}
+      - name: 'cargo check'
+        run: cargo check --workspace --all-targets --features windows
+
   check-rust:
     if: always()
     needs:
@@ -214,23 +235,6 @@ jobs:
           allowed-skips: ${{ toJSON(needs) }}
           jobs: ${{ toJSON(needs) }}
 
-  check-rust-windows:
-    needs: changes
-    runs-on: windows-latest
-    if: ${{ needs.changes.outputs.rust == 'true' }}
-    env:
-      CARGO_TERM_COLOR: always
-    steps:
-      - uses: actions/checkout@v5
-        with:
-          persist-credentials: false
-      - name: Rust Cache
-        uses: Swatinem/[email protected]
-        with:
-          shared-key: windows-rust-testing
-      - name: 'cargo check'
-        run: cargo check --workspace --all-targets --features windows
-
   # Check that all `actions/checkout` in CI jobs have `persist-credentials: false`.
   check-no-persist-credentials:
     runs-on: ubuntu-latest

scripts/install-debian-dependencies.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -eu -o pipefail
+
+# Install the dependencies needed to build tauri, mainly.
+
+apt update
+apt install libwebkit2gtk-4.1-dev \
+            build-essential \
+            curl \
+            wget \
+            file \
+            libxdo-dev \
+            libssl-dev \
+            libayatana-appindicator3-dev \
+            librsvg2-dev \
+            cmake