Skip to content

Commit f17c24d

Browse files
ReenigneArcherc2vi
authored andcommitted
ci(flatpak): build aarch64 on arm architecture (LizardByte#3680)
1 parent 90c22e9 commit f17c24d

File tree

1 file changed

+9
-31
lines changed

1 file changed

+9
-31
lines changed

.github/workflows/CI.yml

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -45,43 +45,22 @@ jobs:
4545
with:
4646
github_token: ${{ secrets.GITHUB_TOKEN }}
4747

48-
setup_flatpak_matrix:
49-
name: Setup Flatpak Matrix
50-
runs-on: ubuntu-latest
51-
steps:
52-
- name: Set release details
53-
id: flatpak_matrix
54-
# https://www.cynkra.com/blog/2020-12-23-dynamic-gha
55-
run: |
56-
# determine which architectures to build
57-
if [[ "${{ github.event_name }}" == "push" ]]; then
58-
matrix=$((
59-
echo '{ "arch" : ["x86_64", "aarch64"] }'
60-
) | jq -c .)
61-
else
62-
matrix=$((
63-
echo '{ "arch" : ["x86_64"] }'
64-
) | jq -c .)
65-
fi
66-
67-
echo $matrix
68-
echo $matrix | jq .
69-
echo "matrix=$matrix" >> $GITHUB_OUTPUT
70-
71-
outputs:
72-
matrix: ${{ steps.flatpak_matrix.outputs.matrix }}
73-
7448
build_linux_flatpak:
7549
env:
7650
APP_ID: dev.lizardbyte.app.Sunshine
7751
NODE_VERSION: "20"
7852
PLATFORM_VERSION: "23.08"
7953
name: Linux Flatpak
80-
runs-on: ubuntu-22.04
81-
needs: [setup_release, setup_flatpak_matrix]
54+
needs: [setup_release]
55+
runs-on: ${{ matrix.runner }}
8256
strategy:
8357
fail-fast: false # false to test all, true to fail entire job if any fail
84-
matrix: ${{fromJson(needs.setup_flatpak_matrix.outputs.matrix)}}
58+
matrix:
59+
include:
60+
- arch: x86_64
61+
runner: ubuntu-22.04
62+
- arch: aarch64
63+
runner: ubuntu-22.04-arm
8564

8665
steps:
8766
- name: Maximize build space
@@ -126,8 +105,7 @@ jobs:
126105
sudo apt-get update -y
127106
sudo apt-get install -y \
128107
cmake \
129-
flatpak \
130-
qemu-user-static
108+
flatpak
131109
132110
sudo su $(whoami) -c "flatpak --user remote-add --if-not-exists flathub \
133111
https://flathub.org/repo/flathub.flatpakrepo"

0 commit comments

Comments
 (0)