Skip to content

Commit 71db8b0

Browse files
committed
Add arm64 build
1 parent 3434063 commit 71db8b0

1 file changed

Lines changed: 41 additions & 17 deletions

File tree

.github/workflows/build.yml

Lines changed: 41 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,34 @@ on:
1111
jobs:
1212
build_ubuntu_x11:
1313
name: Build Ubuntu X11
14-
runs-on: ubuntu-22.04
14+
runs-on: ${{ matrix.cfg.os }}
15+
strategy:
16+
matrix:
17+
cfg:
18+
- { os: ubuntu-22.04, arch: x86_64 }
19+
- { os: ubuntu-22.04-arm, arch: aarch64 }
1520

1621
steps:
1722
- uses: actions/checkout@v4
1823
with:
1924
submodules: "recursive"
2025

21-
- uses: jurplel/install-qt-action@v3
26+
- name: Install Vulkan SDK
27+
run: |
28+
sudo apt update
29+
sudo apt install libvulkan-dev
30+
31+
- name: Install x86_64 Qt
32+
if: ${{ matrix.cfg.arch == 'x86_64' }}
33+
uses: jurplel/install-qt-action@v3
2234
with:
2335
version: 5.12.9
2436
host: linux
2537

26-
- name: Install Vulkan SDK
38+
- name: Install aarch64 Qt
39+
if: ${{ matrix.cfg.arch == 'aarch64' }}
2740
run: |
28-
sudo apt update
29-
sudo apt install libvulkan-dev
41+
sudo apt install qt5-qmake qtbase5-dev libqt5gui5
3042
3143
- name: Install libfuse
3244
run: |
@@ -42,33 +54,45 @@ jobs:
4254
CXX="clang++"
4355
qmake DEFINES+=X11 CONFIG+=release PREFIX=/usr
4456
make INSTALL_ROOT=appdir install ; find appdir/
45-
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
46-
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
57+
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-${{matrix.cfg.arch}}.AppImage"
58+
chmod a+x linuxdeployqt-continuous-${{matrix.cfg.arch}}.AppImage
4759
export VERSION=${TARGET_PLATFORM}
4860
cp vulkanCapsViewer.png appdir/usr/share/icons/hicolor/256x256/apps/vulkanCapsViewer.png
49-
./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/* -appimage
61+
./linuxdeployqt-continuous-${{matrix.cfg.arch}}.AppImage appdir/usr/share/applications/* -appimage
5062
- name: Upload
5163
if: github.ref == 'refs/heads/master'
52-
run: curl -T Vulkan_Caps_Viewer-X11-x86_64.AppImage ftp://${{ secrets.FTP_USER_NAME }}:${{ secrets.FTP_PASS }}@${{ secrets.FTP_SERVER_NAME }}
64+
run: curl -T Vulkan_Caps_Viewer-X11-${{matrix.cfg.arch}}.AppImage ftp://${{ secrets.FTP_USER_NAME }}:${{ secrets.FTP_PASS }}@${{ secrets.FTP_SERVER_NAME }}
5365

5466
build_ubuntu_wayland:
5567
name: Build Ubuntu Wayland
56-
runs-on: ubuntu-22.04
68+
runs-on: ${{ matrix.cfg.os }}
69+
strategy:
70+
matrix:
71+
cfg:
72+
- { os: ubuntu-22.04, arch: x86_64 }
73+
- { os: ubuntu-22.04-arm, arch: aarch64 }
5774

5875
steps:
5976
- uses: actions/checkout@v4
6077
with:
6178
submodules: "recursive"
6279

63-
- uses: jurplel/install-qt-action@v3
80+
- name: Install Vulkan SDK
81+
run: |
82+
sudo apt update
83+
sudo apt install libvulkan-dev libwayland-dev
84+
85+
- name: Install x86_64 Qt
86+
if: ${{ matrix.cfg.arch == 'x86_64' }}
87+
uses: jurplel/install-qt-action@v3
6488
with:
6589
version: 5.12.9
6690
host: linux
6791

68-
- name: Install Vulkan SDK
92+
- name: Install aarch64 Qt
93+
if: ${{ matrix.cfg.arch == 'aarch64' }}
6994
run: |
70-
sudo apt update
71-
sudo apt install libvulkan-dev libwayland-dev
95+
sudo apt install qt5-qmake qtbase5-dev libqt5gui5
7296
7397
- name: Install libfuse
7498
run: |
@@ -84,11 +108,11 @@ jobs:
84108
CXX="clang++"
85109
qmake DEFINES+=WAYLAND CONFIG+=release PREFIX=/usr
86110
make INSTALL_ROOT=appdir install ; find appdir/
87-
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
88-
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
111+
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-${{matrix.cfg.arch}}.AppImage"
112+
chmod a+x linuxdeployqt-continuous-${{matrix.cfg.arch}}.AppImage
89113
export VERSION=${TARGET_PLATFORM}
90114
cp vulkanCapsViewer.png appdir/usr/share/icons/hicolor/256x256/apps/vulkanCapsViewer.png
91-
./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/* -appimage -exclude-libs=libwayland-client.so
115+
./linuxdeployqt-continuous-${{matrix.cfg.arch}}.AppImage appdir/usr/share/applications/* -appimage -exclude-libs=libwayland-client.so
92116
- name: Upload
93117
if: github.ref == 'refs/heads/master'
94118
run: curl -T Vulkan_Caps_Viewer-wayland-x86_64.AppImage ftp://${{ secrets.FTP_USER_NAME }}:${{ secrets.FTP_PASS }}@${{ secrets.FTP_SERVER_NAME }}

0 commit comments

Comments
 (0)