Skip to content

Commit b9b7dbd

Browse files
committed
CI: modify flatpak.yml
1 parent 252177d commit b9b7dbd

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

.github/workflows/flatpak.yml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,33 @@ on:
77

88
jobs:
99
build_flatpak:
10+
strategy:
11+
matrix:
12+
variant:
13+
- arch: x86_64
14+
runner: ubuntu-24.04
15+
- arch: aarch64
16+
runner: ubuntu-24.04-arm
1017

1118
# See: [About GitHub-hosted runners](https://docs.github.com/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners)
1219
# See: [Choosing the runner for a job](https://docs.github.com/actions/writing-workflows/choosing-where-your-workflow-runs/choosing-the-runner-for-a-job)
1320
# See: https://github.com/actions/runner-images/
14-
runs-on: ubuntu-latest
21+
runs-on: ${{ matrix.variant.runner }}
22+
container:
23+
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-44
24+
options: --privileged
1525

1626
steps:
1727
- name: Checkout Repository
18-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
1929
with:
2030
submodules: recursive
2131

2232
- name: Flatpak build
23-
run: |
24-
sudo apt-get update -y -q
25-
sudo apt-get install -y -q flatpak flatpak-builder
26-
sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
27-
sudo flatpak install -y org.kde.Sdk//6.8 org.kde.Platform//6.8
28-
flatpak-builder --user --force-clean --install build Package/io.github.KangLin.RabbitRemoteControl.json
29-
33+
uses: flathub-infra/flatpak-github-actions/flatpak-builder@master
34+
with:
35+
bundle: RabbitRemoteControl.flatpak
36+
manifest-path: Package/io.github.KangLin.RabbitRemoteControl.json
37+
cache-key: flatpak-builder-${{ github.sha }}
38+
arch: ${{ matrix.variant.arch }}
39+
verbose: false

Package/io.github.KangLin.RabbitRemoteControl.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@
165165
"-DWITH_SAMPLE:BOOL=OFF",
166166
"-DWITH_OSS:BOOL=OFF",
167167
"-DCHANNEL_URBDRC:BOOL=OFF",
168+
"-DWITH_CLIENT_SDL=OFF",
169+
"-DWITH_CLIENT=OFF",
168170
"-DWITH_KRB5=ON"
169171
],
170172
"cleanup": [

0 commit comments

Comments
 (0)