Skip to content

Commit

Permalink
fix: require Qt 6.5, FTBFS on ubuntu 24.04 CI
Browse files Browse the repository at this point in the history
  • Loading branch information
BLumia committed Sep 9, 2024
1 parent 1a8f335 commit b80fdac
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
14 changes: 10 additions & 4 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on: [push, pull_request, workflow_dispatch]

jobs:
build:
strategy:
matrix:
qt_ver: ['6.7.2']
runs-on: ubuntu-24.04
steps:
- name: Checkout
Expand All @@ -13,11 +16,16 @@ jobs:
- name: Install build dept.
run: |
sudo apt update
sudo apt install cmake qt6-base-dev qt6-tools-dev qt6-declarative-dev portaudio19-dev libopenmpt-dev
sudo apt install cmake portaudio19-dev libopenmpt-dev
# for linuxdeploy: https://github.com/AppImage/AppImageKit/wiki/FUSE
# linuxdeploy-plugin-qt still requires qmake currently: https://github.com/linuxdeploy/linuxdeploy-plugin-qt/issues/156
sudo add-apt-repository universe
sudo apt install libfuse2 qmake6
sudo apt install libfuse2
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: ${{ matrix.qt_ver }}
modules: 'qtmultimedia'
- name: Get linuxdeploy
run: |
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
Expand All @@ -29,8 +37,6 @@ jobs:
cmake -B build .
cmake --build build -j
- name: Package
env:
QMAKE: /usr/bin/qmake6
run: |
./linuxdeploy-x86_64.AppImage --appdir AppDir -e build/widget/pineapple-tracker-player -d dist/net.blumia.pineapple-tracker-player.desktop -i dist/pineapple-tracker-player.svg --icon-filename net.blumia.pineapple-tracker-player -p qt -o appimage
rm ./linuxdeploy*x86_64.AppImage
Expand Down
2 changes: 1 addition & 1 deletion widget/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(Qt6 REQUIRED COMPONENTS Widgets)
find_package(Qt6 6.5.0 REQUIRED COMPONENTS Widgets)
find_package(ECM 5.83.0 NO_MODULE)

if(ECM_FOUND)
Expand Down

0 comments on commit b80fdac

Please sign in to comment.