Skip to content

Commit 525e2d7

Browse files
committed
feat: Enhance system dependency installation in Tauri CI to enable universe repo and improve package handling
1 parent fdb1f9f commit 525e2d7

1 file changed

Lines changed: 37 additions & 1 deletion

File tree

.github/workflows/tauri-ci.yml

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,14 @@ jobs:
2626
- name: Build web assets
2727
run: npm run build --if-present
2828

29-
- name: Install system dependencies (skip missing packages)
29+
- name: Install system dependencies (enable universe and skip missing packages)
3030
run: |
3131
sudo apt-get update
3232
set -euo pipefail
33+
# Ensure `add-apt-repository` is available and enable the 'universe' repo
34+
sudo apt-get install -y --no-install-recommends software-properties-common || true
35+
sudo add-apt-repository -y universe || true
36+
sudo apt-get update || true
3337
PACKAGES=(
3438
pkg-config
3539
libglib2.0-dev
@@ -56,6 +60,38 @@ jobs:
5660
echo "Available pkg-config search paths:" && pkg-config --variable pc_path pkg-config || true
5761
fi
5862
63+
# Try to locate / install JavaScriptCore/WebKit GTK dev packages required by
64+
# `javascriptcore-rs-sys`. Attempt several candidate package names and
65+
# print apt search results to aid debugging if none are available.
66+
echo "Searching for javascriptcoregtk packages in apt cache..."
67+
apt-cache search javascriptcoregtk || true
68+
CANDIDATES=(
69+
libjavascriptcoregtk-4.1-dev
70+
libjavascriptcoregtk-4.1-0-dev
71+
libjavascriptcoregtk-4.0-dev
72+
libwebkit2gtk-4.0-dev
73+
libwebkit2gtk-4.1-dev
74+
)
75+
76+
for cand in "${CANDIDATES[@]}"; do
77+
if apt-cache show "$cand" >/dev/null 2>&1; then
78+
echo "Installing candidate $cand"
79+
sudo apt-get install -y --no-install-recommends "$cand" || true
80+
else
81+
echo "Candidate $cand not available"
82+
fi
83+
done
84+
85+
# Check for javascriptcoregtk pkg-config entry
86+
if pkg-config --exists javascriptcoregtk-4.1; then
87+
echo "pkg-config: javascriptcoregtk-4.1 found -> $(pkg-config --modversion javascriptcoregtk-4.1)"
88+
elif pkg-config --exists javascriptcoregtk-4.0; then
89+
echo "pkg-config: javascriptcoregtk-4.0 found -> $(pkg-config --modversion javascriptcoregtk-4.0)"
90+
else
91+
echo "pkg-config: javascriptcoregtk-* NOT found"
92+
echo "Listing /usr/lib pkgconfig files:" && ls -1 /usr/lib/*pkgconfig* || true
93+
fi
94+
5995
- name: Install Rust toolchain
6096
uses: actions-rs/toolchain@v1
6197
with:

0 commit comments

Comments
 (0)