@@ -23,13 +23,15 @@ jobs:
2323 file : build
2424 qt_arch : windows
2525 qt_version : 6.8.3
26+ qt6_modules : " qtserialport"
2627 pretty : " Windows Artifact"
2728 - os : ubuntu-22.04
2829 c_compiler : clang
2930 cpp_compiler : clang++
3031 file : OpenFIRE_App-x86_64.AppImage
3132 qt_arch : linux
3233 qt_version : 5.15.2
34+ qt6_modules : " qtserialport qtwaylandcompositor"
3335 sys_arch : x86_64
3436 install_prefix : -DCMAKE_INSTALL_PREFIX=/usr
3537 pretty : " Linux x86 AppImage"
3941 file : OpenFIRE_App-x86_64.AppImage
4042 qt_arch : linux
4143 qt_version : 6.8.3
44+ qt6_modules : " qtserialport qtwaylandcompositor"
4245 sys_arch : x86_64
4346 install_prefix : -DCMAKE_INSTALL_PREFIX=/usr
4447 pretty : " Linux x86 AppImage"
4851 file : OpenFIRE_App-aarch64.AppImage
4952 qt_arch : linux_arm64
5053 qt_version : 6.7.3
54+ qt6_modules : " qtserialport qtwaylandcompositor"
5155 sys_arch : aarch64
5256 install_prefix : -DCMAKE_INSTALL_PREFIX=/usr
5357 pretty : " Linux ARM AppImage"
@@ -85,15 +89,15 @@ jobs:
8589 uses : jdpurcell/install-qt-action@v5
8690 with :
8791 version : ' ${{ matrix.qt_version }}'
88- archives : ' qtbase qttranslations qttools qtsvg qtserialport icu'
92+ archives : ' qtbase qtwayland qttranslations qttools qtsvg qtserialport icu'
8993 - name : Install Qt(6)
9094 if : ${{ matrix.qt_version != '5.15.2' }}
9195 uses : jdpurcell/install-qt-action@v5
9296 with :
9397 version : ' ${{ matrix.qt_version }}'
9498 host : ' ${{ matrix.qt_arch }}'
95- modules : ' qtserialport '
96- archives : ' qtbase qttranslations qttools qtsvg icu'
99+ modules : ' ${{ matrix.qt6_modules }} '
100+ archives : ' qtbase qtwayland qttranslations qttools qtsvg icu'
97101
98102 - name : Configure CMake
99103 # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
@@ -119,12 +123,13 @@ jobs:
119123
120124 - name : Setup AppImage
121125 if : ${{ matrix.os != 'windows-2019' }}
122- # thanks linuxdeploy for not preinstalling your dependencies :<
126+ env :
127+ EXTRA_PLATFORM_PLUGINS : libqwayland-generic.so
128+ EXTRA_QT_MODULES : waylandcompositor
123129 run : |
124130 make install DESTDIR=AppDir
125- install -Dm755 "${{ github.workspace }}/org.TeamOpenFIRE.OpenFIREapp.desktop" "AppDir/usr/share/applications/org.TeamOpenFIRE.OpenFIREapp.desktop"
126131 install -Dm755 "${{ github.workspace }}/img/ico/openfire.svg" "AppDir/usr/share/icons/hicolor/scalable/apps/org.TeamOpenFIRE.OpenFIREapp.svg"
127- "${{ runner.temp }}/linuxdeploy/linuxdeploy-${{ matrix.sys_arch }}.AppImage" --plugin=qt --output appimage --appdir AppDir --desktop-file "${{ github.workspace }}/org.TeamOpenFIRE.OpenFIREapp.desktop" --icon-file "${{ github.workspace }}/img/ico/openfire.svg"
132+ "${{ runner.temp }}/linuxdeploy/linuxdeploy-${{ matrix.sys_arch }}.AppImage" --plugin=qt --output appimage --appdir AppDir --desktop-file "${{ github.workspace }}/org.TeamOpenFIRE.OpenFIREapp.desktop"
128133 cp ${{ matrix.file }} ${{ github.workspace }}
129134 working-directory : ${{ steps.strings.outputs.build-output-dir }}
130135
0 commit comments