Skip to content

Commit 877408e

Browse files
committed
Unify minimal CI dependencies - we need dbus for secrets support
1 parent 4314abc commit 877408e

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.github/workflows/push.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ jobs:
7777
save-if: ${{ github.ref == 'refs/heads/master' }}
7878
# Node is needed for the formatting of typescript files.
7979
- uses: ./.github/actions/init-env-node
80-
- run: |
81-
sudo apt install libdbus-1-dev pkg-config
82-
./scripts/generate-ts-definitions-from-rust.sh
80+
- name: Dependencies for 'keyring'
81+
run: sudo ./scripts/install-minimal-debian-dependencies.sh
82+
- run: ./scripts/generate-ts-definitions-from-rust.sh
8383

8484
lint-node:
8585
if: ${{ needs.changes.outputs.node == 'true' || needs.changes.outputs.rust == 'true' }}
@@ -179,9 +179,7 @@ jobs:
179179
shared-key: cargo-test-no-tauri
180180
save-if: ${{ github.ref == 'refs/heads/master' }}
181181
- name: Dependencies for 'keyring'
182-
run: |
183-
sudo apt update
184-
sudo apt install -y libdbus-1-dev pkg-config
182+
run: sudo ./scripts/install-minimal-debian-dependencies.sh
185183
- run: |
186184
cargo test --workspace --exclude gitbutler-tauri --exclude but-server
187185
env:
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
set -eu -o pipefail
4+
5+
# Install the dependencies needed to build the but-server and the CLI.
6+
apt update
7+
apt install -y libdbus-1-dev pkg-config

scripts/install-tauri-debian-dependencies.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
set -eu -o pipefail
44

55
# Install the dependencies needed to build tauri, mainly.
6-
7-
set -x
86
apt update
97
apt install libwebkit2gtk-4.1-dev \
108
build-essential \

0 commit comments

Comments
 (0)