Skip to content

Commit 3455244

Browse files
authored
feat(cli): bundle appindicator library in the AppImage, closes #3859 (#4267)
1 parent 3a7cd28 commit 3455244

19 files changed

Lines changed: 452 additions & 314 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"tauri-bundler": patch
3+
---
4+
5+
Bundle the tray library file (`.so` extension) in the AppImage if the `TRAY_LIBRARY_PATH` environment variable is set.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"cli.rs": patch
3+
"cli.js": patch
4+
---
5+
6+
Set the `TRAY_LIBRARY_PATH` environment variable to make the bundle copy the appindicator library to the AppImage.

.github/workflows/artifacts-updater.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
with:
4242
toolchain: stable
4343

44-
- name: install webkit2gtk (ubuntu only)
44+
- name: install Linux dependencies
4545
if: matrix.platform == 'ubuntu-latest'
4646
run: |
4747
sudo apt-get update

.github/workflows/covector-version-or-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions-rs/toolchain@v1
2727
with:
2828
toolchain: stable
29-
- name: install webkit2gtk (ubuntu only)
29+
- name: install Linux dependencies
3030
if: matrix.platform == 'ubuntu-latest'
3131
run: |
3232
sudo apt-get update

.github/workflows/lint-fmt-cli.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ jobs:
5555
override: true
5656
components: clippy
5757

58+
- name: install Linux dependencies
59+
run: |
60+
sudo apt-get update
61+
sudo apt-get install -y libgtk-3-dev
62+
5863
- name: Get current date
5964
run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
6065

.github/workflows/test-cli.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ jobs:
4040
toolchain: stable
4141
override: true
4242

43+
- name: install Linux dependencies
44+
if: matrix.platform == 'ubuntu-latest'
45+
run: |
46+
sudo apt-get update
47+
sudo apt-get install -y libgtk-3-dev
48+
4349
- name: Get current date
4450
run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
4551
if: matrix.platform == 'macos-latest' || matrix.platform == 'ubuntu-latest'
@@ -106,7 +112,8 @@ jobs:
106112
node-version: 14
107113
cache: yarn
108114
cache-dependency-path: tooling/cli/node/yarn.lock
109-
- name: install webkit2gtk (ubuntu only)
115+
116+
- name: install Linux dependencies
110117
if: matrix.platform == 'ubuntu-latest'
111118
run: |
112119
sudo apt-get update

.github/workflows/test-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: actions-rs/toolchain@v1
4141
with:
4242
toolchain: stable
43-
- name: install webkit2gtk (ubuntu only)
43+
- name: install Linux dependencies
4444
if: matrix.platform == 'ubuntu-latest'
4545
run: |
4646
sudo apt-get update

.github/workflows/udeps.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ jobs:
5151
toolchain: nightly
5252
override: true
5353

54+
- name: install Linux dependencies
55+
run: |
56+
sudo apt-get update
57+
sudo apt-get install -y libgtk-3-dev
58+
5459
- name: Get current date
5560
run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
5661

0 commit comments

Comments
 (0)