Merge pull request #11395 from Byron/fix

Ensure but-server is tested/built on CI

Author: Byron

.github/workflows/push.yaml

@@ -77,9 +77,9 @@ jobs:
           save-if: ${{ github.ref == 'refs/heads/master' }}
       # Node is needed for the formatting of typescript files.
       - uses: ./.github/actions/init-env-node
-      - run: |
-          sudo apt install libdbus-1-dev pkg-config
-          ./scripts/generate-ts-definitions-from-rust.sh
+      - name: Dependencies for 'keyring'
+        run: sudo ./scripts/install-minimal-debian-dependencies.sh
+      - run: ./scripts/generate-ts-definitions-from-rust.sh
 
   lint-node:
     if: ${{ needs.changes.outputs.node == 'true' || needs.changes.outputs.rust == 'true' }}
@@ -179,16 +179,13 @@ jobs:
           shared-key: cargo-test-no-tauri
           save-if: ${{ github.ref == 'refs/heads/master' }}
       - name: Dependencies for 'keyring'
-        run: |
-          sudo apt update
-          sudo apt install -y libdbus-1-dev pkg-config
-      - run: |
-          cargo test --workspace --exclude gitbutler-tauri --exclude but-server
+        run: sudo ./scripts/install-minimal-debian-dependencies.sh
+      - run: cargo test --workspace --exclude gitbutler-tauri --exclude but-server
         env:
           GITBUTLER_TESTS_NO_CLEANUP: '1'
-        name: cargo test
       # It's intentional to use 'name equals run-script' so it's easy to re-run locally on failure.
       - run: cargo test -p but --no-default-features
+      - run: cargo test -p but-server
 
   rust-test-tauri:
     needs: changes

scripts/install-minimal-debian-dependencies.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -eu -o pipefail
+
+# Install the dependencies needed to build the but-server and the CLI.
+apt update
+apt install -y libdbus-1-dev pkg-config

scripts/install-tauri-debian-dependencies.sh

@@ -3,8 +3,6 @@
 set -eu -o pipefail
 
 # Install the dependencies needed to build tauri, mainly.
-
-set -x
 apt update
 apt install libwebkit2gtk-4.1-dev \
             build-essential \