Skip to content

Commit 392e5f5

Browse files
committed
Re-Enable all CI builds
1 parent e025a8f commit 392e5f5

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ jobs:
5353
TARGET_PLATFORM: X11
5454
run: |
5555
echo ${TARGET_PLATFORM}
56-
PATH="/opt/qt512/bin:$PATH"
5756
CXX="clang++"
5857
qmake DEFINES+=X11 CONFIG+=release PREFIX=/usr
5958
make INSTALL_ROOT=appdir install_icon ; find appdir/
@@ -73,7 +72,7 @@ jobs:
7372
matrix:
7473
cfg:
7574
- { os: ubuntu-22.04, arch: x86_64 }
76-
# - { os: ubuntu-24.04-arm, arch: aarch64 }
75+
- { os: ubuntu-24.04-arm, arch: aarch64 }
7776

7877
steps:
7978
- uses: actions/checkout@v4
@@ -110,15 +109,14 @@ jobs:
110109
TARGET_PLATFORM: wayland
111110
run: |
112111
echo ${TARGET_PLATFORM}
113-
PATH="/opt/qt512/bin:$PATH"
114112
CXX="clang++"
115113
qmake DEFINES+=WAYLAND CONFIG+=release PREFIX=/usr
116-
make INSTALL_ROOT=appdir install ; find appdir/
117-
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-${{matrix.cfg.arch}}.AppImage"
118-
chmod a+x linuxdeployqt-continuous-${{matrix.cfg.arch}}.AppImage
119-
export VERSION=${TARGET_PLATFORM}
120-
cp vulkanCapsViewer.png appdir/usr/share/icons/hicolor/256x256/apps/vulkanCapsViewer.png
121-
./linuxdeployqt-continuous-${{matrix.cfg.arch}}.AppImage appdir/usr/share/applications/* -appimage -exclude-libs=libwayland-client.so
114+
make INSTALL_ROOT=appdir install_icon ; find appdir/
115+
wget -c -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${{matrix.cfg.arch}}.AppImage"
116+
wget -c -nv "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-${{matrix.cfg.arch}}.AppImage"
117+
chmod +x linuxdeploy*.AppImage
118+
./linuxdeploy-${{matrix.cfg.arch}}.AppImage --appdir=appdir --output=appimage -e ./vulkanCapsViewer -d vulkanCapsViewer.desktop -i ./vulkanCapsViewer.png -p qt
119+
mv Vulkan_Caps_Viewer-${{matrix.cfg.arch}}.AppImage Vulkan_Caps_Viewer-X11-${{matrix.cfg.arch}}.AppImage
122120
- name: Upload
123121
if: github.ref == 'refs/heads/master'
124122
run: curl -T Vulkan_Caps_Viewer-wayland-${{matrix.cfg.arch}}.AppImage ftp://${{ secrets.FTP_USER_NAME }}:${{ secrets.FTP_PASS }}@${{ secrets.FTP_SERVER_NAME }}

0 commit comments

Comments
 (0)